fix code to work with php 7.2

Author: dbu

composer.json

@@ -13,7 +13,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "7.1.*",
+        "php": "^7.1",
         "doctrine/common": "^2.4",
         "doctrine/annotations": "^1.2",
         "doctrine/data-fixtures": "^1.0",

lib/Doctrine/ODM/PHPCR/Id/IdException.php

@@ -14,7 +14,7 @@ public static function noIdentificationParameters($document, $parent, $nodename)
                 'may not be empty in document of class "%s"',
             $parent,
             $nodename,
-            ClassUtils::getClass($document)
+            $document ? ClassUtils::getClass($document) : 'null'
         );
 
         return new self($message);
@@ -25,7 +25,7 @@ public static function noIdNoParent($document, $parent)
         $message = sprintf(
             'Property "%s" mapped as ParentDocument may not be empty in document of class "%s"',
             $parent,
-            ClassUtils::getClass($document)
+            $document ? ClassUtils::getClass($document) : 'null'
         );
 
         return new self($message);
@@ -36,7 +36,7 @@ public static function noIdNoName($document, $fieldName)
         $message = sprintf(
             'NodeName property "%s" may not be empty in document of class "%s"',
             $fieldName,
-            ClassUtils::getClass($document)
+            $document ? ClassUtils::getClass($document) : 'null'
         );
 
         return new self($message);
@@ -49,7 +49,7 @@ public static function parentIdCouldNotBeDetermined($document, $parent, $parentO
             'ParentDocument property "%s" of document of class "%s" contains an ' .
             'object for which no ID could be found',
             $parent,
-            ClassUtils::getClass($document),
+            $document ? ClassUtils::getClass($document) : 'null',
             $parentType
         );
 
@@ -61,7 +61,7 @@ public static function illegalName($document, $fieldName, $nodeName)
         $message = sprintf(
             'NodeName property "%s" of document "%s" contains the illegal PHPCR value "%s".',
             $fieldName,
-            ClassUtils::getClass($document),
+            $document ? ClassUtils::getClass($document) : 'null',
             $nodeName
         );
 
@@ -78,7 +78,7 @@ public static function conflictingChildName(
         $message = sprintf(
             '%s discovered as new child of %s in field "%s" has a node name ' .
             'mismatch. The mapping says "%s" but the child was assigned "%s".',
-            ClassUtils::getClass($childDocument),
+            $childDocument ? ClassUtils::getClass($childDocument) : 'null',
             $parentId,
             $parentFieldName,
             $fieldNodeName,

tests/Doctrine/Tests/ODM/PHPCR/Functional/FindTypeValidationTest.php

@@ -2,9 +2,7 @@
 
 namespace Doctrine\Tests\ODM\PHPCR\Functional;
 
-use Doctrine\ODM\PHPCR\Id\RepositoryIdInterface;
-use Doctrine\ODM\PHPCR\DocumentRepository;
-use Doctrine\ODM\PHPCR\Exception\InvalidArgumentException;
+use Doctrine\Tests\ODM\PHPCR\PHPCRFunctionalTestCase;
 use PHPCR\PropertyType;
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
 
@@ -13,7 +11,7 @@
  *
  * @group functional
  */
-class FindTypeValidationTest extends \Doctrine\Tests\ODM\PHPCR\PHPCRFunctionalTestCase
+class FindTypeValidationTest extends PHPCRFunctionalTestCase
 {
     /**
      * @var \Doctrine\ODM\PHPCR\DocumentManager
@@ -114,7 +112,7 @@ public function testNotInstanceOf()
     {
         $user = $this->dm->find('Doctrine\Tests\ODM\PHPCR\Functional\TypeTeamUser', '/functional/user');
 
-        $this->assertTrue(null === $user, get_class($user));
+        $this->assertTrue(null === $user, is_object($user) ? get_class($user) : $user);
     }
 
     /**
@@ -126,7 +124,7 @@ public function testCacheNotInstanceOf()
         $this->assertInstanceOf($this->type, $user);
 
         $user = $this->dm->find('Doctrine\Tests\ODM\PHPCR\Functional\TypeTeamUser', '/functional/user');
-        $this->assertTrue(null === $user, get_class($user));
+        $this->assertTrue(null === $user, is_object($user) ? get_class($user) : $user);
     }
 
     /**

tests/Doctrine/Tests/ODM/PHPCR/Id/ParentIdGeneratorTest.php

@@ -8,7 +8,7 @@
 class ParentIdGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
+     * @covers \Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
      */
     public function testGenerate()
     {
@@ -34,7 +34,7 @@ public function testGenerate()
     }
 
     /**
-     * @covers Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
+     * @covers \Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
      */
     public function testGenerateNoParent()
     {
@@ -48,7 +48,7 @@ public function testGenerateNoParent()
     }
 
     /**
-     * @covers Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
+     * @covers \Doctrine\ODM\PHPCR\Id\ParentIdGenerator::generate
      */
     public function testGenerateNoName()
     {

tests/Doctrine/Tests/ODM/PHPCR/Tools/Command/DocumentConvertTranslationCommandTest.php

@@ -60,6 +60,11 @@ public function testCommand()
             ->with('Document\MyClass', array('en'), array(), 'none')
             ->will($this->returnValue(false))
         ;
+        $this->converter
+            ->expects($this->any())
+            ->method('getLastNotices')
+            ->will($this->returnValue(array()))
+        ;
 
         $this->mockSession
             ->expects($this->once())