Emulate PHP 7's \TypeError

dunglas · dunglas · commit 799ab295fcbe · 2016-02-23T17:40:08.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -586,22 +586,15 @@ private function writeProperty(&$object, $property, $value)
      * @throws \Exception
      */
     private function callMethod($object, $method, $value) {
-        // Cannot use class_exists because the PHP 7 polyfill defines \TypeError
         if (PHP_MAJOR_VERSION >= 7) {
-            // PHP 7
-            try {
-                $object->{$method}($value);
-            } catch (\TypeError $e) {
-                throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-            }
-
+            $object->{$method}($value);
             return;
         }
 
-        // PHP 5
-        set_error_handler(function ($errno, $errstr) {
-            if (E_RECOVERABLE_ERROR === $errno) {
-                throw new InvalidArgumentException($errstr);
+        // Emulates PHP 7 behavior
+        set_error_handler(function ($errno, $errstr) use ($object, $method) {
+            if (E_RECOVERABLE_ERROR === $errno && false !== strpos($errstr, sprintf('passed to %s::%s() must', get_class($object), $method))) {
+                throw new \TypeError($errstr);
             }
 
             return false;
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -513,7 +513,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \TypeError
      */
     public function testConvertTypeErrorToInvalidArgumentException()
     {
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9"
+        "php": ">=5.5.9",
+        "symfony/polyfill-php70": "~1.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PropertyAccess\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`/**`
`516`		`- * @expectedException InvalidArgumentException`
	`516`	`+ * @expectedException \TypeError`
`517`	`517`	`*/`
`518`	`518`	`public function testConvertTypeErrorToInvalidArgumentException()`
`519`	`519`	`{`