minor #46513 [Cache][Lock][VarExporter] Remove dead branches of PHP version checks (derrabus)

nicolas-grekas · nicolas-grekas · commit 2424b43320b1 · 2022-05-31T15:32:01.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Cache][Lock][VarExporter] Remove dead branches of PHP version checks | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A This PR removes various code that won't be executed on PHP 8.1 and above. Commits ------- a182410 Remove dead branches of PHP version checks
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -56,7 +56,7 @@ class MemcachedAdapter extends AbstractAdapter
     public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
+            throw new CacheException('Memcached > 3.1.5 is required.');
         }
         if ('Memcached' === \get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);
@@ -76,7 +76,7 @@ public function __construct(\Memcached $client, string $namespace = '', int $def
 
     public static function isSupported()
     {
-        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');
+        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');
     }
 
     /**
@@ -100,7 +100,7 @@ public static function createConnection(array|string $servers, array $options =
             throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', get_debug_type($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
+            throw new CacheException('Memcached > 3.1.5 is required.');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -33,7 +33,7 @@ class MemcachedAdapterTest extends AdapterTestCase
     public static function setUpBeforeClass(): void
     {
         if (!MemcachedAdapter::isSupported()) {
-            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
+            throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');
         }
         self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
         self::$client->get('foo');
diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
@@ -29,8 +29,8 @@ class MemcachedStoreTest extends AbstractStoreTest
 
     public static function setUpBeforeClass(): void
     {
-        if (version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '<')) {
-            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
+        if (version_compare(phpversion('memcached'), '3.1.6', '<')) {
+            throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');
         }
 
         $memcached = new \Memcached();
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -133,7 +133,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                 $i = 0;
                 $n = (string) $name;
                 if ('' === $n || "\0" !== $n[0]) {
-                    $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+                    $c = $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
                 } elseif ('*' === $n[1]) {
                     $n = substr($n, 3);
                     $c = $reflector->getProperty($n)->class;
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -131,7 +131,7 @@ public function provideExport()
             new \DatePeriod($start, $interval, 4),
         ]];
 
-        $value = \PHP_VERSION_ID >= 70406 ? new ArrayObject() : new \ArrayObject();
+        $value = new ArrayObject();
         $value[0] = 1;
         $value->foo = new \ArrayObject();
         $value[1] = $value;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class MemcachedAdapter extends AbstractAdapter`
`56`	`56`	`public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
`57`	`57`	`{`
`58`	`58`	`if (!static::isSupported()) {`
`59`		`- throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');`
	`59`	`+ throw new CacheException('Memcached > 3.1.5 is required.');`
`60`	`60`	`}`
`61`	`61`	`if ('Memcached' === \get_class($client)) {`
`62`	`62`	`$opt = $client->getOption(\Memcached::OPT_SERIALIZER);`
`@@ -76,7 +76,7 @@ public function __construct(\Memcached $client, string $namespace = '', int $def`
`76`	`76`
`77`	`77`	`public static function isSupported()`
`78`	`78`	`{`
`79`		`- return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');`
	`79`	`+ return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`@@ -100,7 +100,7 @@ public static function createConnection(array\|string $servers, array $options =`
`100`	`100`	`throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', get_debug_type($servers)));`
`101`	`101`	`}`
`102`	`102`	`if (!static::isSupported()) {`
`103`		`- throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');`
	`103`	`+ throw new CacheException('Memcached > 3.1.5 is required.');`
`104`	`104`	`}`
`105`	`105`	`set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });`
`106`	`106`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class MemcachedAdapterTest extends AdapterTestCase`
`33`	`33`	`public static function setUpBeforeClass(): void`
`34`	`34`	`{`
`35`	`35`	`if (!MemcachedAdapter::isSupported()) {`
`36`		`- throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');`
	`36`	`+ throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');`
`37`	`37`	`}`
`38`	`38`	`self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);`
`39`	`39`	`self::$client->get('foo');`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ class MemcachedStoreTest extends AbstractStoreTest`
`29`	`29`
`30`	`30`	`public static function setUpBeforeClass(): void`
`31`	`31`	`{`
`32`		`- if (version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '<')) {`
`33`		`- throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');`
	`32`	`+ if (version_compare(phpversion('memcached'), '3.1.6', '<')) {`
	`33`	`+ throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`$memcached = new \Memcached();`