Fixed tests for php7

schmittjoh · May 6, 2016 · a8ab1fd · a8ab1fd
1 parent c17f188
commit a8ab1fd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ php:
 
 matrix:
   allow_failures:
-    - php: 7.0
     - php: hhvm
 
 before_script:

diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         "jms/metadata": "~1.1",
         "jms/parser-lib": "1.*",
         "phpcollection/phpcollection": "~0.1",
-        "doctrine/annotations": "1.*",
-        "doctrine/instantiator": "~1.0.3"
+        "doctrine/annotations": "^1.0",
+        "doctrine/instantiator": "^1.0.3"
     },
     "conflict": {
         "twig/twig": "<1.12"
@@ -28,8 +28,8 @@
     "require-dev": {
         "twig/twig": "~1.12|~2.0",
         "doctrine/orm": "~2.1",
-        "doctrine/phpcr-odm": "^1.0.1",
-        "jackalope/jackalope-doctrine-dbal": "1.0.*",
+        "doctrine/phpcr-odm": "^1.3",
+        "jackalope/jackalope-doctrine-dbal": "^1.0",
         "propel/propel1": "~1.7",
         "symfony/yaml": "2.*",
         "symfony/translation": "~2.0",

diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php
@@ -32,7 +32,7 @@ class Author
     protected $id;
 
     /**
-     * @PHPCRODM\String()
+     * @PHPCRODM\Field(type="string")
      * @SerializedName("full_name")
      */
     private $name;

diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php
@@ -39,24 +39,24 @@ class BlogPost
     protected $id;
 
     /**
-     * @PHPCRODM\String()
+     * @PHPCRODM\Field(type="string")
      * @Groups({"comments","post"})
      */
     private $title;
 
     /**
-     * @PHPCRODM\String()
+     * @PHPCRODM\Field(type="string")
      */
     protected $slug;
 
     /**
-     * @PHPCRODM\Date()
+     * @PHPCRODM\Field(type="date")
      * @XmlAttribute
      */
     private $createdAt;
 
     /**
-     * @PHPCRODM\Boolean()
+     * @PHPCRODM\Field(type="boolean")
      * @Type("integer")
      * This boolean to integer conversion is one of the few changes between this
      * and the standard BlogPost class. It's used to test the override behavior

diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php
@@ -39,7 +39,7 @@ class Comment
     private $blogPost;
 
     /**
-     * @PHPCRODM\String()
+     * @PHPCRODM\Field(type="string")
      */
     private $text;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -27,5 +27,4 @@
     $loader->add('JMS\Serializer\Tests', __DIR__);
 
     AnnotationRegistry::registerLoader('class_exists');
-    AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');
 });