cs

Author: samsonasik

composer.json

@@ -72,7 +72,7 @@
         "phpstan/phpstan": "^0.12.90",
         "phpstan/phpstan-webmozart-assert": "^0.12.7",
         "pimple/pimple": "^3.2",
-        "rector/rector": "^0.11.43",
+        "rector/rector": "^0.11.52",
         "symfony/dependency-injection": "^5.0"
     },
     "suggest": {

spec/Handler/LoggingSpec.php

@@ -13,7 +13,7 @@
 use Laminas\Db\TableGateway\TableGateway;
 use Laminas\Http\PhpEnvironment\Request;
 use Laminas\Log\Logger;
-use Laminas\Log\Writer\Db as DbWriter;
+use Laminas\Log\Writer\Db;
 use Laminas\Mail\Message;
 use ReflectionProperty;
 
@@ -98,7 +98,7 @@
 
         ];
 
-        $this->dbWriter = Double::instance(['extends' => DbWriter::class, 'methods' => '__construct']);
+        $this->dbWriter = Double::instance(['extends' => Db::class, 'methods' => '__construct']);
         $reflectionProperty = new ReflectionProperty($this->dbWriter, 'db');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->dbWriter, Double::instance(['implements' => AdapterInterface::class]));

spec/Middleware/MezzioFactorySpec.php

@@ -16,7 +16,7 @@
 use Kahlan\Plugin\Double;
 use Laminas\ServiceManager\ServiceManager;
 use Mezzio\Template\TemplateRendererInterface;
-use Northwoods\Container\InjectorContainer as AurynInjectorContainer;
+use Northwoods\Container\InjectorContainer;
 use PDO;
 use Pimple\Container as PimpleContainer;
 use Pimple\Psr11\Container as Psr11PimpleContainer;
@@ -30,7 +30,7 @@
     given('mapCreateContainers', fn() : array => [
         AuraContainer::class               => (new AuraContainerBuilder())->newInstance(),
         SymfonyContainerBuilder::class     => new SymfonyContainerBuilder(),
-        AurynInjectorContainer::class      => new AurynInjectorContainer(new Injector()),
+        InjectorContainer::class      => new InjectorContainer(new Injector()),
         Psr11PimpleContainer::class        => new Psr11PimpleContainer(new PimpleContainer()),
     ]);
 
@@ -207,11 +207,13 @@
                 if ($container instanceof AuraContainer) {
                     $config = new ArrayObject($config);
                 }
+
                 allow($container)->toReceive('get')->with('config')
                                                 ->andReturn($config);
                 if ($container instanceof AuraContainer) {
                     $config = $config->getArrayCopy();
                 }
+
                 allow($container)->toReceive('has')->with(EntityManager::class)->andReturn(false);
 
                 $logging = Double::instance(['extends' => Logging::class, 'methods' => '__construct']);
@@ -245,11 +247,13 @@
                 if ($container instanceof AuraContainer) {
                     $config = new ArrayObject($config);
                 }
+
                 allow($container)->toReceive('get')->with('config')
                                                 ->andReturn($config);
                 if ($container instanceof AuraContainer) {
                     $config = $config->getArrayCopy();
                 }
+
                 allow($container)->toReceive('has')->with(EntityManager::class)->andReturn(false);
 
                 $logging = Double::instance(['extends' => Logging::class, 'methods' => '__construct']);
@@ -276,11 +280,13 @@
                 if ($container instanceof AuraContainer) {
                     $config = new ArrayObject($config);
                 }
+
                 allow($container)->toReceive('get')->with('config')
                                                 ->andReturn($config);
                 if ($container instanceof AuraContainer) {
                     $config = $config->getArrayCopy();
                 }
+
                 allow($container)->toReceive('has')->with(EntityManager::class)->andReturn(false);
 
                 $logging = Double::instance(['extends' => Logging::class, 'methods' => '__construct']);
@@ -306,11 +312,13 @@
                 if ($container instanceof AuraContainer) {
                     $config = new ArrayObject($config);
                 }
+
                 allow($container)->toReceive('get')->with('config')
                                                 ->andReturn($config);
                 if ($container instanceof AuraContainer) {
                     $config = $config->getArrayCopy();
                 }
+
                 allow($container)->toReceive('has')->with(EntityManager::class)->andReturn(false);
 
                 $logging = Double::instance(['extends' => Logging::class, 'methods' => '__construct']);

src/Handler/Formatter/Json.php

@@ -34,6 +34,7 @@ public function format($event): string
         if (! $timestamp && isset($event[self::TIMESTAMP]) && $event[self::TIMESTAMP] instanceof DateTime) {
             $timestamp = $event[self::TIMESTAMP]->format($this->getDateTimeFormat());
         }
+
         $event[self::TIMESTAMP] = $timestamp;
 
         return str_replace(

src/Handler/Logging.php

@@ -33,8 +33,11 @@
 class Logging
 {
     private array $configLoggingSettings = [];
-    private array $emailReceivers        = [];
+
+    private array $emailReceivers = [];
+
     private string $emailSender;
+
     /**
      * @var string
      */
@@ -203,6 +206,7 @@ private function isExists(
                     if ($handlerWriterDb->isExists($errorFile, $errorLine, $errorMessage, $url, $errorType)) {
                         return true;
                     }
+
                     break;
                 } catch (RuntimeException $runtimeException) {
                     // use \Laminas\Db\Adapter\Exception\RuntimeException but do here

src/Handler/Writer/Checker/Db.php

@@ -85,6 +85,7 @@ public function isExists(
                 if ($diff <= $this->configLoggingSettings['same-error-log-time-range']) {
                     return true;
                 }
+
                 break;
             }
         }

src/Middleware/MezzioFactory.php

@@ -15,11 +15,11 @@
 use ErrorHeroModule\Transformer\SymfonyService;
 use Laminas\ServiceManager\ServiceManager;
 use Mezzio\Template\TemplateRendererInterface;
-use Northwoods\Container\InjectorContainer as AurynInjectorContainer;
+use Northwoods\Container\InjectorContainer;
 use Pimple\Psr11\Container as Psr11PimpleContainer;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
-use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Webmozart\Assert\Assert;
 
 use function array_key_exists;
@@ -29,13 +29,13 @@
 class MezzioFactory
 {
     /**
-     * @var array<class-string, class-string>
+     * @var array<string, class-string<AuraService>|class-string<AurynService>|class-string<PimpleService>|class-string<SymfonyService>>
      */
     private const CONTAINERS_TRANSFORM = [
-        SymfonyContainerBuilder::class => SymfonyService::class,
-        AuraContainer::class           => AuraService::class,
-        AurynInjectorContainer::class  => AurynService::class,
-        Psr11PimpleContainer::class    => PimpleService::class,
+        ContainerBuilder::class     => SymfonyService::class,
+        AuraContainer::class        => AuraService::class,
+        InjectorContainer::class    => AurynService::class,
+        Psr11PimpleContainer::class => PimpleService::class,
     ];
 
     private function createMiddlewareInstance(ContainerInterface $container, array $configuration): Mezzio

src/Transformer/AuraService.php

@@ -4,7 +4,7 @@
 
 namespace ErrorHeroModule\Transformer;
 
-use Aura\Di\Container as AuraContainer;
+use Aura\Di\Container;
 use Closure;
 use Psr\Container\ContainerInterface;
 use Webmozart\Assert\Assert;
@@ -13,7 +13,7 @@ class AuraService extends TransformerAbstract implements TransformerInterface
 {
     public static function transform(ContainerInterface $container, array $configuration): ContainerInterface
     {
-        Assert::isInstanceOf($container, AuraContainer::class);
+        Assert::isInstanceOf($container, Container::class);
 
         $dbAdapterConfig = parent::getDbAdapterConfig($configuration);
         $logger          = parent::getLoggerInstance($configuration, $dbAdapterConfig);

src/Transformer/AurynService.php

@@ -6,15 +6,15 @@
 
 use Closure;
 use Laminas\Log\Logger;
-use Northwoods\Container\InjectorContainer as AurynInjectorContainer;
+use Northwoods\Container\InjectorContainer;
 use Psr\Container\ContainerInterface;
 use Webmozart\Assert\Assert;
 
 class AurynService extends TransformerAbstract implements TransformerInterface
 {
     public static function transform(ContainerInterface $container, array $configuration): ContainerInterface
     {
-        Assert::isInstanceOf($container, AurynInjectorContainer::class);
+        Assert::isInstanceOf($container, InjectorContainer::class);
 
         $dbAdapterConfig = parent::getDbAdapterConfig($configuration);
         $logger          = parent::getLoggerInstance($configuration, $dbAdapterConfig);

src/Transformer/Doctrine.php

@@ -5,15 +5,15 @@
 namespace ErrorHeroModule\Transformer;
 
 use Doctrine\ORM\EntityManager;
-use Laminas\ServiceManager\ServiceManager as LaminasServiceManager;
+use Laminas\ServiceManager\ServiceManager;
 use Psr\Container\ContainerInterface;
 use Webmozart\Assert\Assert;
 
 class Doctrine extends TransformerAbstract implements TransformerInterface
 {
     public static function transform(ContainerInterface $container, array $configuration): ContainerInterface
     {
-        Assert::isInstanceOf($container, LaminasServiceManager::class);
+        Assert::isInstanceOf($container, ServiceManager::class);
 
         $entityManager          = $container->get(EntityManager::class);
         $doctrineDBALConnection = $entityManager->getConnection();