Merge pull request #41 from samsonasik/php74-syntax

Apply PHP 7.4 syntax

Author: Ocramius

src/Factory/AuthControllerFactory.php

@@ -59,9 +59,7 @@ private function getOAuth2ServerFactory(ContainerInterface $container)
             return $oauth2ServerFactory;
         }
 
-        return function () use ($oauth2ServerFactory) {
-            return $oauth2ServerFactory;
-        };
+        return fn() => $oauth2ServerFactory;
     }
 
     /**

src/Factory/OAuth2ServerInstanceFactory.php

@@ -6,7 +6,6 @@
 
 use Interop\Container\ContainerInterface; // phpcs:ignore WebimpressCodingStandard.PHP.CorrectClassNameCase.Invalid
 use Laminas\ApiTools\OAuth2\Controller\Exception;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 use OAuth2\GrantType\AuthorizationCode;
 use OAuth2\GrantType\ClientCredentials;
 use OAuth2\GrantType\JwtBearer;
@@ -20,14 +19,11 @@
 
 class OAuth2ServerInstanceFactory
 {
-    /** @var array */
-    private $config;
+    private array $config;
 
-    /** @var ServiceLocatorInterface */
-    private $services;
+    private ContainerInterface $services;
 
-    /** @var OAuth2Server|null */
-    private $server;
+    private ?OAuth2Server $server = null;
 
     /**
      * @param array $config Configuration to use when creating the instance.

src/Provider/UserId/AuthenticationService.php

@@ -15,11 +15,9 @@
 
 class AuthenticationService implements UserIdProviderInterface
 {
-    /** @var AuthenticationServiceInterface */
-    private $authenticationService;
+    private ?AuthenticationServiceInterface $authenticationService;
 
-    /** @var string */
-    private $userId = 'id';
+    private string $userId = 'id';
 
     /**
      *  Set authentication service

test/Adapter/Pdo/ClientTest.php

@@ -6,7 +6,8 @@
 
 use OAuth2\Storage\ClientInterface;
 
-use function rand;
+use function mt_getrandmax;
+use function random_int;
 
 class ClientTest extends AbstractBaseTest
 {
@@ -79,7 +80,7 @@ public function testSaveClient(ClientInterface $storage): void
             return;
         }
 
-        $clientId = 'some-client-' . rand();
+        $clientId = 'some-client-' . random_int(0, mt_getrandmax());
 
         // create a new client
         $success = $storage->setClientDetails(

test/Adapter/Pdo/JwtBearerTest.php

@@ -36,14 +36,14 @@ public function testGetClientKey(object $storage)
         $this->assertNotNull($key);
         $this->assertEquals(
             $key,
-            <<<'END'
-                -----BEGIN PUBLIC KEY-----
-                MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvfF+Cw8nzsc9Twam37SYpAW3+
-                lRGUle/hYnd9obfBvDHKBvgb1WfGCblwjwImGL9u0rEIW2sspkwBEsGGFFBmSaqq
-                fvEER7Yr++VIidOUHkas3cHO1TVoERO3s0THOobw0OzghPnMJL6ayelYOESwfnqR
-                WfuEMSaWaW0G38QPzwIDAQAB
-                -----END PUBLIC KEY-----
-                END
+            <<<'END_WRAP'
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvfF+Cw8nzsc9Twam37SYpAW3+
+lRGUle/hYnd9obfBvDHKBvgb1WfGCblwjwImGL9u0rEIW2sspkwBEsGGFFBmSaqq
+fvEER7Yr++VIidOUHkas3cHO1TVoERO3s0THOobw0OzghPnMJL6ayelYOESwfnqR
+WfuEMSaWaW0G38QPzwIDAQAB
+-----END PUBLIC KEY-----
+END_WRAP
         );
     }
 }

test/Controller/AuthControllerTest.php

@@ -413,9 +413,7 @@ public function testTokenActionUsesCodeFromTokenExceptionIfPresentToCreateApiPro
         $oauth2Server
             ->handleTokenRequest(Argument::type(OAuth2Request::class))
             ->willThrow($exception);
-        $factory = function () use ($oauth2Server): OAuth2Server {
-            return $oauth2Server->reveal();
-        };
+        $factory = fn(): OAuth2Server => $oauth2Server->reveal();
 
         $provider = $this->prophesize(UserIdProviderInterface::class)->reveal();
 
@@ -447,9 +445,7 @@ public function testTokenActionUses401CodeIfTokenExceptionCodeIsInvalidWhenCreat
         $oauth2Server
             ->handleTokenRequest(Argument::type(OAuth2Request::class))
             ->willThrow($exception);
-        $factory = function () use ($oauth2Server): OAuth2Server {
-            return $oauth2Server->reveal();
-        };
+        $factory = fn(): OAuth2Server => $oauth2Server->reveal();
 
         $provider = $this->prophesize(UserIdProviderInterface::class)->reveal();
 

test/Factory/MongoAdapterFactoryTest.php

@@ -83,7 +83,7 @@ public function testInstanceCreatedWithMongoDbInServiceLocator(): void
                 ],
             ],
         ]);
-        $mock = $this->getMockBuilder(MongoDB::class, [], [], '', false)
+        $mock = $this->getMockBuilder(MongoDB::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->services->setService('testdb', $mock);
@@ -104,7 +104,7 @@ public function testCanPassAdapterConfigurationWhenCreatingInstance(): void
                 ],
             ],
         ]);
-        $mock = $this->getMockBuilder(MongoDB::class, [], [], '', false)
+        $mock = $this->getMockBuilder(MongoDB::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->services->setService('testdb', $mock);

test/Factory/OAuth2ServerFactoryTest.php

@@ -63,7 +63,7 @@ public function testExceptionThrownOnMissingStorageClass(): void
 
         $this->services->setService('config', []);
         $smFactory = $this->factory;
-        $factory   = $smFactory($this->services, 'OAuth2Server');
+        $factory   = $smFactory($this->services);
 
         $this->expectException(RuntimeException::class);
         $factory();

test/TestAsset/autoload_laminas_authenticationservice/global.php

@@ -17,7 +17,7 @@
         ),
     ),
     'api-tools-oauth2' => array(
-        'storage' => 'Laminas\ApiTools\OAuth2\Adapter\PdoAdapter',
+        'storage' => \Laminas\ApiTools\OAuth2\Adapter\PdoAdapter::class,
         'db' => array(
             'dsn' => 'sqlite::memory:',
         ),
@@ -37,13 +37,13 @@
     'service_manager' => array(
         'aliases' => array(
             'translator' => 'MvcTranslator',
-            'Laminas\ApiTools\OAuth2\Provider\UserId' => 'Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationService',
+            'Laminas\ApiTools\OAuth2\Provider\UserId' => \Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationService::class,
         ),
         'invokables' => array(
-            'Laminas\Authentication\AuthenticationService' => 'Laminas\Authentication\AuthenticationService',
+            \Laminas\Authentication\AuthenticationService::class => \Laminas\Authentication\AuthenticationService::class,
         ),
         'factories' => array(
-            'Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationService' => 'Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationServiceFactory',
+            \Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationService::class => \Laminas\ApiTools\OAuth2\Provider\UserId\AuthenticationServiceFactory::class,
         ),
     ),
 );