minor #22894 Remove PHP<7 leftovers (chalasr)

nicolas-grekas · nicolas-grekas · commit 8e0d41a87b19 · 2017-05-25T08:54:37.000+02:00
This PR was merged into the 4.0-dev branch. Discussion ---------- Remove PHP<7 leftovers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Forgot while cleaning up Commits ------- f0147da Remove PHP < 7.1 leftovers
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/FactoryReturnTypePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/FactoryReturnTypePassTest.php
@@ -98,7 +98,6 @@ public function testCircularReference()
     }
 
     /**
-     * @requires function ReflectionMethod::getReturnType
      * @expectedDeprecation Relying on its factory's return-type to define the class of service "factory" is deprecated since Symfony 3.3 and won't work in 4.0. Set the "class" attribute to "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummy" on the service definition instead.
      */
     public function testCompile()
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -780,11 +780,7 @@ public function serialize()
 
     public function unserialize($data)
     {
-        if (PHP_VERSION_ID >= 70000) {
-            list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
-        } else {
-            list($environment, $debug) = unserialize($data);
-        }
+        list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
 
         $this->__construct($environment, $debug);
     }
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -74,8 +74,6 @@ class PropertyAccessor implements PropertyAccessorInterface
      * @var array
      */
     private $writePropertyCache = array();
-    private static $previousErrorHandler = false;
-    private static $errorHandler = array(__CLASS__, 'handleError');
     private static $resultProto = array(self::VALUE => null);
 
     /**
@@ -173,24 +171,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value)
             }
         } catch (\TypeError $e) {
             self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0);
-        } finally {
-            if (PHP_VERSION_ID < 70000 && false !== self::$previousErrorHandler) {
-                restore_error_handler();
-                self::$previousErrorHandler = false;
-            }
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public static function handleError($type, $message, $file, $line, $context)
-    {
-        if (E_RECOVERABLE_ERROR === $type) {
-            self::throwInvalidArgumentException($message, debug_backtrace(false), 1);
         }
-
-        return null !== self::$previousErrorHandler && false !== call_user_func(self::$previousErrorHandler, $type, $message, $file, $line, $context);
     }
 
     private static function throwInvalidArgumentException($message, $trace, $i)
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
@@ -56,7 +56,6 @@ public function decodeProvider()
     }
 
     /**
-     * @requires function json_last_error_msg
      * @dataProvider decodeProviderException
      * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      */
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
@@ -17,7 +17,7 @@
 
 class JsonEncodeTest extends TestCase
 {
-    private $encoder;
+    private $encode;
 
     protected function setUp()
     {
@@ -50,7 +50,6 @@ public function encodeProvider()
     }
 
     /**
-     * @requires function json_last_error_msg
      * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      */
     public function testEncodeWithError()

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public function testCircularReference()`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/**`
`101`		`- * @requires function ReflectionMethod::getReturnType`
`102`	`101`	`* @expectedDeprecation Relying on its factory's return-type to define the class of service "factory" is deprecated since Symfony 3.3 and won't work in 4.0. Set the "class" attribute to "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummy" on the service definition instead.`
`103`	`102`	`*/`
`104`	`103`	`public function testCompile()`
Original file line number	Diff line number	Diff line change
`@@ -780,11 +780,7 @@ public function serialize()`
`780`	`780`
`781`	`781`	`public function unserialize($data)`
`782`	`782`	`{`
`783`		`- if (PHP_VERSION_ID >= 70000) {`
`784`		`- list($environment, $debug) = unserialize($data, array('allowed_classes' => false));`
`785`		`- } else {`
`786`		`- list($environment, $debug) = unserialize($data);`
`787`		`- }`
	`783`	`+ list($environment, $debug) = unserialize($data, array('allowed_classes' => false));`
`788`	`784`
`789`	`785`	`$this->__construct($environment, $debug);`
`790`	`786`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public function decodeProvider()`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * @requires function json_last_error_msg`
`60`	`59`	`* @dataProvider decodeProviderException`
`61`	`60`	`* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException`
`62`	`61`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`class JsonEncodeTest extends TestCase`
`19`	`19`	`{`
`20`		`- private $encoder;`
	`20`	`+ private $encode;`
`21`	`21`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`@@ -50,7 +50,6 @@ public function encodeProvider()`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
`53`		`- * @requires function json_last_error_msg`
`54`	`53`	`* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException`
`55`	`54`	`*/`
`56`	`55`	`public function testEncodeWithError()`