Remove dead code related to old PHP versions

Author: stof

src/Core/src/Credentials/InstanceProvider.php

@@ -119,17 +119,12 @@ private function toArray(ResponseInterface $response): array
         }
 
         try {
-            $content = json_decode($content, true, 512, \JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0));
+            $content = json_decode($content, true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
         } catch (\JsonException $e) {
             /** @psalm-suppress all */
             throw new JsonException(\sprintf('%s for "%s".', $e->getMessage(), $response->getInfo('url')), $e->getCode());
         }
 
-        if (\PHP_VERSION_ID < 70300 && \JSON_ERROR_NONE !== json_last_error()) {
-            /** @psalm-suppress InvalidArgument */
-            throw new JsonException(\sprintf('%s for "%s".', json_last_error_msg(), $response->getInfo('url')), json_last_error());
-        }
-
         if (!\is_array($content)) {
             /** @psalm-suppress InvalidArgument */
             throw new JsonException(\sprintf('JSON content was expected to decode to an array, %s returned for "%s".', \gettype($content), $response->getInfo('url')));

src/Core/src/Credentials/SsoTokenProvider.php

@@ -150,7 +150,7 @@ private function loadSsoToken(string $sessionName): ?array
                 $content,
                 true,
                 512,
-                \JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0)
+                \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR
             );
         } catch (\JsonException $e) {
             $this->logger->warning(

src/Core/src/Test/ResultMockFactory.php

@@ -84,9 +84,6 @@ public static function create(string $class, array $data = [])
         // Make sure the Result is initialized
         $reflectionClass = new \ReflectionClass(Result::class);
         $initializedProperty = $reflectionClass->getProperty('initialized');
-        if (\PHP_VERSION_ID < 80100) {
-            $initializedProperty->setAccessible(true);
-        }
 
         /** @psalm-var \ReflectionClass<T> $reflectionClass */
         $reflectionClass = new \ReflectionClass($class);
@@ -118,9 +115,6 @@ public static function create(string $class, array $data = [])
                     $property = $reflectionClass->getProperty($propertyName);
                 }
             }
-            if (\PHP_VERSION_ID < 80100) {
-                $property->setAccessible(true);
-            }
             $property->setValue($object, $propertyValue);
         }
 
@@ -155,14 +149,8 @@ public static function waiter(string $class, string $finalState)
 
         $reflectionClass = new \ReflectionClass(Waiter::class);
         $propertyResponse = $reflectionClass->getProperty('response');
-        if (\PHP_VERSION_ID < 80100) {
-            $propertyResponse->setAccessible(true);
-        }
 
         $propertyState = $reflectionClass->getProperty('finalState');
-        if (\PHP_VERSION_ID < 80100) {
-            $propertyState->setAccessible(true);
-        }
 
         /** @psalm-var \ReflectionClass<T> $reflectionClass */
         $reflectionClass = new \ReflectionClass($class);
@@ -225,9 +213,6 @@ private static function addUndefinedProperties(\ReflectionClass $reflectionClass
             }
 
             if (null !== $propertyValue) {
-                if (\PHP_VERSION_ID < 80100) {
-                    $property->setAccessible(true);
-                }
                 $property->setValue($object, $propertyValue);
             }
         }
@@ -270,18 +255,12 @@ private static function addPropertiesOnResult(\ReflectionClass $reflectionClass,
         if (class_exists($awsClientClass)) {
             $awsClientMock = (new \ReflectionClass($awsClientClass))->newInstanceWithoutConstructor();
             $property = $reflectionClass->getProperty('awsClient');
-            if (\PHP_VERSION_ID < 80100) {
-                $property->setAccessible(true);
-            }
             $property->setValue($object, $awsClientMock);
         }
 
         if (class_exists($inputClass)) {
             $inputMock = (new \ReflectionClass($inputClass))->newInstanceWithoutConstructor();
             $property = $reflectionClass->getProperty('input');
-            if (\PHP_VERSION_ID < 80100) {
-                $property->setAccessible(true);
-            }
             $property->setValue($object, $inputMock);
         }
     }
@@ -292,21 +271,12 @@ private static function getResponseObject(): Response
         $response = $reflectionClass->newInstanceWithoutConstructor();
 
         $property = $reflectionClass->getProperty('resolveResult');
-        if (\PHP_VERSION_ID < 80100) {
-            $property->setAccessible(true);
-        }
         $property->setValue($response, true);
 
         $property = $reflectionClass->getProperty('bodyDownloaded');
-        if (\PHP_VERSION_ID < 80100) {
-            $property->setAccessible(true);
-        }
         $property->setValue($response, true);
 
         $property = $reflectionClass->getProperty('httpResponse');
-        if (\PHP_VERSION_ID < 80100) {
-            $property->setAccessible(true);
-        }
         $property->setValue($response, new SimpleMockedResponse());
 
         return $response;

src/Integration/Laravel/Cache/tests/Unit/ServiceProviderTest.php

@@ -23,9 +23,6 @@ public function testCreateStore()
         self::assertInstanceOf(AsyncAwsDynamoDbStore::class, $store);
         $refl = new \ReflectionClass($store);
         $property = $refl->getProperty('dynamoDb');
-        if (\PHP_VERSION_ID < 80100) {
-            $property->setAccessible(true);
-        }
         $client = $property->getValue($store);
 
         $config = $client->getConfiguration();

src/Integration/Symfony/Bundle/tests/Functional/BundleInitializationTest.php

@@ -186,9 +186,6 @@ public function testIssue1758Cache()
 
         $r = new \ReflectionObject($cache);
         $p = $r->getProperty('cache');
-        if (\PHP_VERSION_ID < 80100) {
-            $p->setAccessible(true);
-        }
 
         $adapter = $p->getValue($cache);
         self::assertInstanceOf(ApcuAdapter::class, $adapter);
@@ -207,9 +204,6 @@ public function testIssue1758Provider()
 
         $r = new \ReflectionClass(AbstractApi::class);
         $p = $r->getProperty('credentialProvider');
-        if (\PHP_VERSION_ID < 80100) {
-            $p->setAccessible(true);
-        }
 
         $credentialProvider = $p->getValue($client);
         self::assertInstanceOf(InstanceProvider::class, $credentialProvider);
@@ -230,9 +224,6 @@ public function testIssue1758ProviderAndCache()
 
         $r = new \ReflectionClass(AbstractApi::class);
         $p = $r->getProperty('credentialProvider');
-        if (\PHP_VERSION_ID < 80100) {
-            $p->setAccessible(true);
-        }
 
         $credentialProvider = $p->getValue($client);
         self::assertInstanceOf(CacheProvider::class, $credentialProvider);
@@ -241,17 +232,11 @@ public function testIssue1758ProviderAndCache()
 
         $r = new \ReflectionObject($cache);
         $p = $r->getProperty('cache');
-        if (\PHP_VERSION_ID < 80100) {
-            $p->setAccessible(true);
-        }
 
         $adapter = $p->getValue($cache);
         self::assertInstanceOf(ApcuAdapter::class, $adapter);
 
         $p = $r->getProperty('decorated');
-        if (\PHP_VERSION_ID < 80100) {
-            $p->setAccessible(true);
-        }
 
         $decorated = $p->getValue($cache);
         self::assertInstanceOf(InstanceProvider::class, $decorated);

src/Service/Ses/tests/Unit/SesClientTest.php

@@ -159,9 +159,6 @@ public function testSignService()
         $ses = new SesClient([], new NullProvider());
         $refl = new \ReflectionClass($ses);
         $method = $refl->getMethod('getEndpointMetadata');
-        if (\PHP_VERSION_ID < 80100) {
-            $method->setAccessible(true);
-        }
         $data = $method->invokeArgs($ses, ['eu-central-1']);
 
         self::assertEquals('ses', $data['signService']);