Skip to content

Commit

Permalink
Camelcase container FQCN
Browse files Browse the repository at this point in the history
Signed-off-by: Witold Wasiczko <witold@wasiczko.pl>
  • Loading branch information
snapshotpl committed Jun 3, 2022
1 parent d508a42 commit 48d8579
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
86 changes: 43 additions & 43 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Factory/AuthControllerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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),
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/Factory/MongoAdapterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(
Expand All @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions src/Factory/OAuth2ServerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

namespace Laminas\ApiTools\OAuth2\Factory;

use interop\container\containerinterface;
use Interop\Container\ContainerInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;

class OAuth2ServerFactory
{
/**
* @return OAuth2ServerInstanceFactory
*/
public function __invoke(containerinterface $container)
public function __invoke(ContainerInterface $container)
{
$config = $container->get('config');
$config = $config['api-tools-oauth2'] ?? [];
Expand Down
6 changes: 3 additions & 3 deletions src/Factory/OAuth2ServerInstanceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading

0 comments on commit 48d8579

Please sign in to comment.