Merge pull request #135 from symfony-cmf/phpcr_odm_1_3

fix issues with PHP7 due to use of String annotation class, added testing of lower dependencies
symfony-cmf · Jun 26, 2015 · 9bc7a5e · 9bc7a5e
2 parents dde6f21 + ae17050
commit 9bc7a5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Tests/Resources/Document/Content.php b/Tests/Resources/Document/Content.php
@@ -43,7 +43,7 @@ class Content
     protected $name;
 
     /**
-     * @PHPCRODM\String
+     * @PHPCRODM\Field(type="string")
      */
     protected $title;
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
     },
     "require-dev": {
         "twig/twig": "~1.12,>=1.12.0",
-        "symfony-cmf/testing": "~1.2,>=1.2.6",
+        "symfony-cmf/testing": "~1.2,>=1.2.7",
+        "doctrine/phpcr-odm": "~1.3",
         "doctrine/annotations": ">=1.1.2",
         "jms/serializer-bundle": "~0.12",
         "liip/imagine-bundle": "~1.0.4",