Merge pull request #304 from symfony-cmf/phpcr_odm_1_3

lsmith77 · lsmith77 · commit 424232510e0a · 2015-06-26T09:22:49.000+02:00
fix issues with PHP7 due to use of String annotation class
diff --git a/Tests/Resources/Document/Content.php b/Tests/Resources/Document/Content.php
@@ -34,7 +34,7 @@ class Content
     private $name;
 
     /**
-     * @PHPCRODM\String
+     * @PHPCRODM\Field(type="string")
      */
     private $title;
 
diff --git a/Tests/WebTest/RedirectRouteAdminTest.php b/Tests/WebTest/RedirectRouteAdminTest.php
@@ -17,11 +17,6 @@
 
 class RedirectRouteAdminTest extends BaseTestCase
 {
-    /**
-     * @var \Symfony\Bundle\FrameworkBundle\Client
-     */
-    private $client;
-
     public function setUp()
     {
         $this->db('PHPCR')->loadFixtures(array(
diff --git a/Tests/WebTest/RouteAdminTest.php b/Tests/WebTest/RouteAdminTest.php
@@ -17,11 +17,6 @@
 
 class RouteAdminTest extends BaseTestCase
 {
-    /**
-     * @var \Symfony\Bundle\FrameworkBundle\Client
-     */
-    private $client;
-
     public function setUp()
     {
         $this->db('PHPCR')->loadFixtures(array(
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
     },
     "require-dev": {
         "symfony-cmf/core-bundle": "~1.1",
-        "symfony-cmf/testing": "~1.2,>=1.2.6",
+        "symfony-cmf/testing": "~1.2,>=1.2.7",
+        "doctrine/phpcr-odm": "~1.3",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "0.*",
         "phpunit/php-code-coverage": "@stable",

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,6 @@`
`17`	`17`
`18`	`18`	`class RedirectRouteAdminTest extends BaseTestCase`
`19`	`19`	`{`
`20`		`- /**`
`21`		`- * @var \Symfony\Bundle\FrameworkBundle\Client`
`22`		`- */`
`23`		`- private $client;`
`24`		`-`
`25`	`20`	`public function setUp()`
`26`	`21`	`{`
`27`	`22`	`$this->db('PHPCR')->loadFixtures(array(`