doctrine#761 Added support for PHP 7.1 identifier nullable return type

aurimasniekis · Jan 13, 2017 · 5a29148 · 5a29148
1 parent 20bd4af
commit 5a29148
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/lib/Doctrine/Common/Proxy/ProxyGenerator.php
@@ -37,7 +37,7 @@ class ProxyGenerator
      * Used to match very simple id methods that don't need
      * to be decorated since the identifier is known.
      */
-    const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*(?::\s*\\\\?[a-z_\x7f-\xff][\w\x7f-\xff]*(?:\\\\[a-z_\x7f-\xff][\w\x7f-\xff]*)*\s*)?{\s*return\s*\$this->%s;\s*})i';
+    const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*(?::\s*\?*\\\\?[a-z_\x7f-\xff][\w\x7f-\xff]*(?:\\\\[a-z_\x7f-\xff][\w\x7f-\xff]*)*\s*)?{\s*return\s*\$this->%s;\s*})i';
 
     /**
      * The namespace that contains all proxy classes.

diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehints.php b/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehints.php
@@ -52,6 +52,9 @@ class LazyLoadableObjectWithTypehints
     /** @var \stdClass */
     private $identifierFieldReturnClassOneLetter;
 
+    /** @var \stdClass */
+    private $identifierFieldReturnClassOneLetterNullable;
+
     /**
      * @return string
      */
@@ -90,5 +93,10 @@ public function getIdentifierFieldReturnClassOneLetter(): A
         return $this->identifierFieldReturnClassOneLetter;
     }
 
+    public function getIdentifierFieldReturnClassOneLetterNullable(): ?A
+    {
+        return $this->identifierFieldReturnClassOneLetterNullable;
+    }
+
 
 }
diff --git a/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php b/tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithTypehintsClassMetadata.php
@@ -46,6 +46,7 @@ class LazyLoadableObjectWithTypehintsClassMetadata implements ClassMetadata
         'identifierFieldReturnClassFullUse' => true,
         'identifierFieldReturnClassOneWord' => true,
         'identifierFieldReturnClassOneLetter' => true,
+        'identifierFieldReturnClassOneLetterNullable' => true,
     ];
 
     /**
@@ -59,6 +60,7 @@ class LazyLoadableObjectWithTypehintsClassMetadata implements ClassMetadata
         'identifierFieldReturnClassFullUse' => true,
         'identifierFieldReturnClassOneWord' => true,
         'identifierFieldReturnClassOneLetter' => true,
+        'identifierFieldReturnClassOneLetterNullable' => true,
     ];
 
     /**

diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTypehintsTest.php b/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTypehintsTest.php
@@ -72,6 +72,7 @@ public function setUp()
             'identifierFieldReturnClassFullUse' => new LazyLoadableObjectWithTypehints(),
             'identifierFieldReturnClassOneWord' => new stdClass(),
             'identifierFieldReturnClassOneLetter' => new stdClass(),
+            'identifierFieldReturnClassOneLetterNullable' => new stdClass(),
         ];
 
         $this->proxyLoader = $loader      = $this->getMockBuilder(stdClass::class)->setMethods(['load'])->getMock();
@@ -151,6 +152,7 @@ public function dataNoLazyLoadingForIdentifier()
             ['identifierFieldReturnClassFullUse'],
             ['identifierFieldReturnClassOneWord'],
             ['identifierFieldReturnClassOneLetter'],
+            ['identifierFieldReturnClassOneLetterNullable'],
         ];
     }