Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
PSR-12 auto fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Sebastian Hopfe <[email protected]>
  • Loading branch information
@nusphere
nusphere committed Nov 29, 2023
1 parent 14881f7 commit 6df6775
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion composer.lock
View file

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

4 changes: 2 additions & 2 deletions src/FilterPluginManagerFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\Config;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
Expand All @@ -25,7 +25,7 @@ class FilterPluginManagerFactory implements FactoryInterface
*
* @return FilterPluginManager
*/
public function __invoke(ContainerInterface $container, $name, ?array $options = null)
public function __invoke(containerinterface $container, $name, ?array $options = null)
{
$pluginManager = new FilterPluginManager($container, $options ?: []);

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

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\Config;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
Expand All @@ -25,7 +25,7 @@ class FormatterPluginManagerFactory implements FactoryInterface
*
* @return FormatterPluginManager
*/
public function __invoke(ContainerInterface $container, $name, ?array $options = null)
public function __invoke(containerinterface $container, $name, ?array $options = null)
{
$pluginManager = new FormatterPluginManager($container, $options ?: []);

Expand Down
12 changes: 6 additions & 6 deletions src/LoggerAbstractServiceFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use Interop\Container\Exception\ContainerException;
use interop\container\containerinterface;
use interop\container\exception\containerexception;
use Laminas\ServiceManager\AbstractFactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
use Psr\Container\ContainerExceptionInterface;
Expand Down Expand Up @@ -39,7 +39,7 @@ public function __construct(string $configKey = 'log')
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function canCreate(ContainerInterface $container, $requestedName)
public function canCreate(containerinterface $container, $requestedName)
{
$config = $this->getConfig($container);
if (empty($config)) {
Expand All @@ -64,7 +64,7 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
/**
* {@inheritdoc}
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(containerinterface $container, $requestedName, ?array $options = null)
{
$config = $this->getConfig($container);
$config = $config[$requestedName];
Expand All @@ -78,7 +78,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
* @param string $name
* @param string $requestedName
* @return Logger
* @throws ContainerException
* @throws containerexception
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
Expand All @@ -94,7 +94,7 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
protected function getConfig(ContainerInterface $services)
protected function getConfig(containerinterface $services)
{
if (isset($this->config)) {
return $this->config;
Expand Down
6 changes: 3 additions & 3 deletions src/LoggerServiceFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Laminas\Log;

use ArrayAccess;
use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\AbstractPluginManager;
use Laminas\ServiceManager\Exception\InvalidArgumentException;
use Laminas\ServiceManager\FactoryInterface;
Expand Down Expand Up @@ -35,7 +35,7 @@ class LoggerServiceFactory implements FactoryInterface
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(containerinterface $container, $requestedName, ?array $options = null)
{
// Configure the logger
$config = $container->get('config');
Expand Down Expand Up @@ -66,7 +66,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
protected function processConfig(array &$config, ContainerInterface $services)
protected function processConfig(array &$config, containerinterface $services)
{
if (
isset($config['writer_plugin_manager'])
Expand Down
4 changes: 2 additions & 2 deletions src/ProcessorPluginManagerFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\Config;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
Expand All @@ -25,7 +25,7 @@ class ProcessorPluginManagerFactory implements FactoryInterface
*
* @return ProcessorPluginManager
*/
public function __invoke(ContainerInterface $container, $name, ?array $options = null)
public function __invoke(containerinterface $container, $name, ?array $options = null)
{
$pluginManager = new ProcessorPluginManager($container, $options ?: []);

Expand Down
12 changes: 6 additions & 6 deletions src/PsrLoggerAbstractAdapterFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use Interop\Container\Exception\ContainerException;
use interop\container\containerinterface;
use interop\container\exception\containerexception;
use Laminas\ServiceManager\AbstractFactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
use Psr\Container\ContainerExceptionInterface;
Expand Down Expand Up @@ -35,11 +35,11 @@ public function __construct()
/**
* @param string $requestedName
* @return PsrLoggerAdapter
* @throws ContainerException
* @throws containerexception
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(containerinterface $container, $requestedName, ?array $options = null)
{
$loggerFactory = $this->loggerAbstractServiceFactory;
$logger = $loggerFactory($container, $requestedName);
Expand Down Expand Up @@ -69,7 +69,7 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function canCreate(ContainerInterface $container, $requestedName)
public function canCreate(containerinterface $container, $requestedName)
{
return $this->loggerAbstractServiceFactory->canCreate($container, $requestedName);
}
Expand All @@ -80,7 +80,7 @@ public function canCreate(ContainerInterface $container, $requestedName)
* @param string $name
* @param string $requestedName
* @return PsrLoggerAdapter
* @throws ContainerException
* @throws containerexception
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Writer/Factory/WriterFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Laminas\Log\Writer\Factory;

use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\Exception\InvalidServiceException;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
Expand Down Expand Up @@ -52,7 +52,7 @@ public function __construct(?array $creationOptions = null)
* @param null|array $options
* @return object
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(containerinterface $container, $requestedName, ?array $options = null)
{
$options = (array) $options;

Expand All @@ -70,7 +70,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
* @param string $defaultService
* @return array
*/
private function populateOptions(array $options, ContainerInterface $container, $name, $defaultService)
private function populateOptions(array $options, containerinterface $container, $name, $defaultService)
{
if (isset($options[$name]) && is_string($options[$name])) {
$options[$name] = $container->get($options[$name]);
Expand Down
4 changes: 2 additions & 2 deletions src/WriterPluginManagerFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Laminas\Log;

use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\ServiceManager\Config;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
Expand All @@ -25,7 +25,7 @@ class WriterPluginManagerFactory implements FactoryInterface
*
* @return WriterPluginManager
*/
public function __invoke(ContainerInterface $container, $name, ?array $options = null)
public function __invoke(containerinterface $container, $name, ?array $options = null)
{
$pluginManager = new WriterPluginManager($container, $options ?: []);

Expand Down
14 changes: 7 additions & 7 deletions test/FilterPluginManagerFactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace LaminasTest\Log;

use Closure;
use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\Log\Filter\FilterInterface;
use Laminas\Log\FilterPluginManager;
use Laminas\Log\FilterPluginManagerFactory;
Expand All @@ -19,7 +19,7 @@ class FilterPluginManagerFactoryTest extends TestCase

public function testFactoryReturnsPluginManager(): void
{
$container = $this->prophesize(ContainerInterface::class)->reveal();
$container = $this->prophesize(containerinterface::class)->reveal();
$factory = new FilterPluginManagerFactory();

$filters = $factory($container, FilterPluginManagerFactory::class);
Expand All @@ -36,7 +36,7 @@ public function testFactoryReturnsPluginManager(): void
*/
public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
{
$container = $this->prophesize(ContainerInterface::class)->reveal();
$container = $this->prophesize(containerinterface::class)->reveal();
$filter = $this->prophesize(FilterInterface::class)->reveal();

$factory = new FilterPluginManagerFactory();
Expand Down Expand Up @@ -65,7 +65,7 @@ public function testConfiguresFilterServicesWhenFound(): void
];

$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(true);
Expand Down Expand Up @@ -98,7 +98,7 @@ public function testDoesNotConfigureFilterServicesWhenServiceListenerPresent():
];

$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(true);
$container->has('config')->shouldNotBeCalled();
Expand All @@ -115,7 +115,7 @@ public function testDoesNotConfigureFilterServicesWhenServiceListenerPresent():
public function testDoesNotConfigureFilterServicesWhenConfigServiceNotPresent(): void
{
$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(false);
Expand All @@ -130,7 +130,7 @@ public function testDoesNotConfigureFilterServicesWhenConfigServiceNotPresent():
public function testDoesNotConfigureFilterServicesWhenConfigServiceDoesNotContainFiltersConfig(): void
{
$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(true);
Expand Down
14 changes: 7 additions & 7 deletions test/FormatterPluginManagerFactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace LaminasTest\Log;

use Closure;
use Interop\Container\ContainerInterface;
use interop\container\containerinterface;
use Laminas\Log\Formatter\FormatterInterface;
use Laminas\Log\FormatterPluginManager;
use Laminas\Log\FormatterPluginManagerFactory;
Expand All @@ -19,7 +19,7 @@ class FormatterPluginManagerFactoryTest extends TestCase

public function testFactoryReturnsPluginManager(): void
{
$container = $this->prophesize(ContainerInterface::class)->reveal();
$container = $this->prophesize(containerinterface::class)->reveal();
$factory = new FormatterPluginManagerFactory();

$formatters = $factory($container, FormatterPluginManagerFactory::class);
Expand All @@ -36,7 +36,7 @@ public function testFactoryReturnsPluginManager(): void
*/
public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
{
$container = $this->prophesize(ContainerInterface::class)->reveal();
$container = $this->prophesize(containerinterface::class)->reveal();
$formatter = $this->prophesize(FormatterInterface::class)->reveal();

$factory = new FormatterPluginManagerFactory();
Expand Down Expand Up @@ -65,7 +65,7 @@ public function testConfiguresFormatterServicesWhenFound(): void
];

$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(true);
Expand Down Expand Up @@ -98,7 +98,7 @@ public function testDoesNotConfigureFormatterServicesWhenServiceListenerPresent(
];

$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(true);
$container->has('config')->shouldNotBeCalled();
Expand All @@ -115,7 +115,7 @@ public function testDoesNotConfigureFormatterServicesWhenServiceListenerPresent(
public function testDoesNotConfigureFormatterServicesWhenConfigServiceNotPresent(): void
{
$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(false);
Expand All @@ -130,7 +130,7 @@ public function testDoesNotConfigureFormatterServicesWhenConfigServiceNotPresent
public function testDoesNotConfigureFormatterServicesWhenConfigServiceDoesNotContainFormattersConfig(): void
{
$container = $this->prophesize(ServiceLocatorInterface::class);
$container->willImplement(ContainerInterface::class);
$container->willImplement(containerinterface::class);

$container->has('ServiceListener')->willReturn(false);
$container->has('config')->willReturn(true);
Expand Down
Loading

0 comments on commit 6df6775

Please sign in to comment.