From 48d857900647df49cafb43b3c4627251af90184e Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Fri, 3 Jun 2022 10:41:25 +0200 Subject: [PATCH] Camelcase container FQCN Signed-off-by: Witold Wasiczko --- composer.json | 2 +- composer.lock | 86 +++++++++---------- src/Factory/AuthControllerFactory.php | 8 +- src/Factory/MongoAdapterFactory.php | 6 +- src/Factory/OAuth2ServerFactory.php | 4 +- src/Factory/OAuth2ServerInstanceFactory.php | 6 +- src/Factory/PdoAdapterFactory.php | 4 +- .../UserId/AuthenticationServiceFactory.php | 4 +- 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/composer.json b/composer.json index e9c39aa..b38e6f6 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "mockery/mockery": "^1.3.2", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.15", + "psalm/plugin-phpunit": "^0.16", "vimeo/psalm": "^4.23" }, "suggest": { diff --git a/composer.lock b/composer.lock index 580a3c2..135928d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b8a800826aab16efdab3ef476808a28c", + "content-hash": "9bd63d6d07f3eaf5d052a233b813473a", "packages": [ { "name": "brick/varexporter", @@ -1815,16 +1815,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -1839,7 +1839,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1877,7 +1877,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -1893,7 +1893,7 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "webimpress/safe-writer", @@ -4330,16 +4330,16 @@ }, { "name": "psalm/plugin-phpunit", - "version": "0.15.2", + "version": "0.16.1", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "31d15bbc0169a3c454e495e03fd8a6ccb663661b" + "reference": "5dd3be04f37a857d52880ef6af2524a441dfef24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/31d15bbc0169a3c454e495e03fd8a6ccb663661b", - "reference": "31d15bbc0169a3c454e495e03fd8a6ccb663661b", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/5dd3be04f37a857d52880ef6af2524a441dfef24", + "reference": "5dd3be04f37a857d52880ef6af2524a441dfef24", "shasum": "" }, "require": { @@ -4347,7 +4347,7 @@ "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.0" + "vimeo/psalm": "dev-master || dev-4.x || ^4.5" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -4384,9 +4384,9 @@ "description": "Psalm plugin for PHPUnit", "support": { "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", - "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.15.2" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.16.1" }, - "time": "2021-05-29T19:11:38+00:00" + "time": "2021-06-18T23:56:46+00:00" }, { "name": "psr/log", @@ -5828,16 +5828,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -5849,7 +5849,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5889,7 +5889,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -5905,20 +5905,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -5930,7 +5930,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5973,7 +5973,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -5989,20 +5989,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -6017,7 +6017,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6056,7 +6056,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -6072,7 +6072,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php73", @@ -6155,16 +6155,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -6173,7 +6173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6218,7 +6218,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -6234,7 +6234,7 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/service-contracts", diff --git a/src/Factory/AuthControllerFactory.php b/src/Factory/AuthControllerFactory.php index a6235cf..cf38802 100644 --- a/src/Factory/AuthControllerFactory.php +++ b/src/Factory/AuthControllerFactory.php @@ -4,7 +4,7 @@ namespace Laminas\ApiTools\OAuth2\Factory; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ApiTools\OAuth2\Controller\AuthController; use Laminas\ApiTools\OAuth2\Provider\UserId; use Laminas\ServiceManager\FactoryInterface; @@ -18,7 +18,7 @@ class AuthControllerFactory implements FactoryInterface * @param null|array $options * @return AuthController */ - public function __invoke(containerinterface $container, $requestedName, ?array $options = null) + public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null) { $authController = new AuthController( $this->getOAuth2ServerFactory($container), @@ -52,7 +52,7 @@ public function createService(ServiceLocatorInterface $controllers, $name = null * * @return callable */ - private function getOAuth2ServerFactory(containerinterface $container) + private function getOAuth2ServerFactory(ContainerInterface $container) { $oauth2ServerFactory = $container->get('Laminas\ApiTools\OAuth2\Service\OAuth2Server'); if (! $oauth2ServerFactory instanceof OAuth2Server) { @@ -69,7 +69,7 @@ private function getOAuth2ServerFactory(containerinterface $container) * * @return bool */ - private function marshalApiProblemErrorResponse(containerinterface $container) + private function marshalApiProblemErrorResponse(ContainerInterface $container) { if (! $container->has('config')) { return false; diff --git a/src/Factory/MongoAdapterFactory.php b/src/Factory/MongoAdapterFactory.php index 7df6285..cc51318 100644 --- a/src/Factory/MongoAdapterFactory.php +++ b/src/Factory/MongoAdapterFactory.php @@ -5,7 +5,7 @@ namespace Laminas\ApiTools\OAuth2\Factory; use ArrayAccess; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ApiTools\OAuth2\Adapter\MongoAdapter; use Laminas\ApiTools\OAuth2\Controller\Exception; use Laminas\ServiceManager\ServiceLocatorInterface; @@ -19,7 +19,7 @@ class MongoAdapterFactory /** * @return MongoAdapter */ - public function __invoke(containerinterface $container) + public function __invoke(ContainerInterface $container) { $config = $container->get('config'); return new MongoAdapter( @@ -45,7 +45,7 @@ public function createService($container) * @param array|ArrayAccess $config * @return MongoDB */ - protected function getMongoDb(containerinterface $container, $config) + protected function getMongoDb(ContainerInterface $container, $config) { $dbLocatorName = $config['api-tools-oauth2']['mongo']['locator_name'] ?? 'MongoDB'; diff --git a/src/Factory/OAuth2ServerFactory.php b/src/Factory/OAuth2ServerFactory.php index 2ce52de..af7f9cb 100644 --- a/src/Factory/OAuth2ServerFactory.php +++ b/src/Factory/OAuth2ServerFactory.php @@ -4,7 +4,7 @@ namespace Laminas\ApiTools\OAuth2\Factory; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; class OAuth2ServerFactory @@ -12,7 +12,7 @@ class OAuth2ServerFactory /** * @return OAuth2ServerInstanceFactory */ - public function __invoke(containerinterface $container) + public function __invoke(ContainerInterface $container) { $config = $container->get('config'); $config = $config['api-tools-oauth2'] ?? []; diff --git a/src/Factory/OAuth2ServerInstanceFactory.php b/src/Factory/OAuth2ServerInstanceFactory.php index 33c07e4..0187f40 100644 --- a/src/Factory/OAuth2ServerInstanceFactory.php +++ b/src/Factory/OAuth2ServerInstanceFactory.php @@ -4,7 +4,7 @@ namespace Laminas\ApiTools\OAuth2\Factory; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ApiTools\OAuth2\Controller\Exception; use Laminas\ServiceManager\ServiceLocatorInterface; use OAuth2\GrantType\AuthorizationCode; @@ -31,9 +31,9 @@ class OAuth2ServerInstanceFactory /** * @param array $config Configuration to use when creating the instance. - * @param containerinterface $services ServiceLocator for retrieving storage adapters. + * @param ContainerInterface $services ServiceLocator for retrieving storage adapters. */ - public function __construct(array $config, containerinterface $services) + public function __construct(array $config, ContainerInterface $services) { $this->config = $config; $this->services = $services; diff --git a/src/Factory/PdoAdapterFactory.php b/src/Factory/PdoAdapterFactory.php index 0706f08..c8056d8 100644 --- a/src/Factory/PdoAdapterFactory.php +++ b/src/Factory/PdoAdapterFactory.php @@ -4,7 +4,7 @@ namespace Laminas\ApiTools\OAuth2\Factory; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ApiTools\OAuth2\Adapter\PdoAdapter; use Laminas\ApiTools\OAuth2\Controller\Exception; use Laminas\ServiceManager\ServiceLocatorInterface; @@ -16,7 +16,7 @@ class PdoAdapterFactory /** * @return PdoAdapter */ - public function __invoke(containerinterface $container) + public function __invoke(ContainerInterface $container) { $config = $container->get('config'); diff --git a/src/Provider/UserId/AuthenticationServiceFactory.php b/src/Provider/UserId/AuthenticationServiceFactory.php index 5a3c847..c02af04 100644 --- a/src/Provider/UserId/AuthenticationServiceFactory.php +++ b/src/Provider/UserId/AuthenticationServiceFactory.php @@ -4,7 +4,7 @@ namespace Laminas\ApiTools\OAuth2\Provider\UserId; -use interop\container\containerinterface; +use Interop\Container\ContainerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; class AuthenticationServiceFactory @@ -12,7 +12,7 @@ class AuthenticationServiceFactory /** * @return AuthenticationService */ - public function __invoke(containerinterface $container) + public function __invoke(ContainerInterface $container) { $config = $container->get('config');