apply Naming rector set list, use rector-src

samsonasik · samsonasik · commit c4a7cb1d73dd · 2021-07-06T17:26:36.000+07:00
diff --git a/composer.json b/composer.json
@@ -72,8 +72,8 @@
         "phpstan/phpstan": "^0.12.90",
         "phpstan/phpstan-webmozart-assert": "^0.12.7",
         "pimple/pimple": "^3.2",
-        "rector/rector": "0.11.32",
-        "symfony/dependency-injection": "^4.0"
+        "rector/rector-src": "0.11.34",
+        "symfony/dependency-injection": "^5.0"
     },
     "suggest": {
         "laminas/laminas-mvc-console": "^1.1 for laminas-mvc ^3.0 usage to be able to use Console Controller",
diff --git a/rector.php b/rector.php
@@ -13,6 +13,7 @@
     $containerConfigurator->import(SetList::CODE_QUALITY);
     $containerConfigurator->import(SetList::CODE_QUALITY_STRICT);
     $containerConfigurator->import(SetList::CODING_STYLE);
+    $containerConfigurator->import(SetList::NAMING);
     $containerConfigurator->import(SetList::ORDER);
     $containerConfigurator->import(SetList::PHP_70);
     $containerConfigurator->import(SetList::PHP_71);
diff --git a/spec/Integration/IntegrationViaErrorPreviewConsoleControllerWithDoctrineORMModuleSpec.php b/spec/Integration/IntegrationViaErrorPreviewConsoleControllerWithDoctrineORMModuleSpec.php
@@ -33,9 +33,7 @@
         ]);
         $application->getMvcEvent()->setRequest(new Request());
 
-        $events         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
-
         $entityManager  = $serviceManager->get(EntityManager::class);
         $stmt = $entityManager->getConnection()->prepare('DELETE FROM log');
         $stmt->execute();
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForErrorShownSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForErrorShownSpec.php
@@ -26,10 +26,10 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
+        $eventManager         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
         $serviceManager->get('SendResponseListener')
-                       ->detach($events);
+                       ->detach($eventManager);
 
         return $application;
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForHasCookieSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForHasCookieSpec.php
@@ -29,9 +29,7 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
-
         $db  = $serviceManager->get(AdapterInterface::class);
         $tableGateway = new TableGateway('log', $db, null, new ResultSet());
         $tableGateway->delete([]);
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForSpecificErrorAndExceptionSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForSpecificErrorAndExceptionSpec.php
@@ -29,10 +29,10 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
+        $eventManager         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
         $serviceManager->get('SendResponseListener')
-                       ->detach($events);
+                       ->detach($eventManager);
 
         return $application;
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php
@@ -29,9 +29,7 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
-
         $db  = $serviceManager->get(AdapterInterface::class);
         $tableGateway = new TableGateway('log', $db, null, new ResultSet());
         $tableGateway->delete([]);
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php
@@ -30,9 +30,7 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
-
         $db  = $serviceManager->get(AdapterInterface::class);
         $tableGateway = new TableGateway('log', $db, null, new ResultSet());
         $tableGateway->delete([]);
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php
@@ -30,9 +30,7 @@
             ],
         ]);
 
-        $events         = $application->getEventManager();
         $serviceManager = $application->getServiceManager();
-
         $db  = $serviceManager->get(AdapterInterface::class);
         $tableGateway = new TableGateway('log', $db, null, new ResultSet());
         $tableGateway->delete([]);
diff --git a/src/Handler/Logging.php b/src/Handler/Logging.php
@@ -40,7 +40,7 @@ public function __construct(
         private Logger $logger,
         array $errorHeroModuleLocalConfig,
         private array $logWritersConfig,
-        private ?Message $mailMessageService = null,
+        private ?Message $message = null,
         private ?TransportInterface $mailMessageTransport = null,
         private bool $includeFilesToAttachments = true
     ) {
@@ -70,7 +70,7 @@ private function getRequestData(RequestInterface $request): array
         $cookie_data    = $cookie instanceof Cookie
             ? $cookie->getArrayCopy()
             : [];
-        $ip_address     = (new RemoteAddress())->getIpAddress();
+        $ipAddress      = (new RemoteAddress())->getIpAddress();
 
         return [
             'request_method' => $request_method,
@@ -79,34 +79,37 @@ private function getRequestData(RequestInterface $request): array
             'raw_data'       => $raw_data,
             'files_data'     => $files_data,
             'cookie_data'    => $cookie_data,
-            'ip_address'     => $ip_address,
+            'ip_address'     => $ipAddress,
         ];
     }
 
     /**
      * @return array<string, mixed>
      */
-    private function collectErrorExceptionData(Throwable $t): array
+    private function collectErrorExceptionData(Throwable $throwable): array
     {
-        if ($t instanceof ErrorException && isset(Logger::$errorPriorityMap[$severity = $t->getSeverity()])) {
+        if (
+            $throwable instanceof ErrorException
+            && isset(Logger::$errorPriorityMap[$severity = $throwable->getSeverity()])
+        ) {
             $priority  = Logger::$errorPriorityMap[$severity];
             $errorType = HeroConstant::ERROR_TYPE[$severity];
         } else {
             $priority  = Logger::ERR;
-            $errorType = $t::class;
+            $errorType = $throwable::class;
         }
 
-        $errorFile    = $t->getFile();
-        $errorLine    = $t->getLine();
-        $trace        = $t->getTraceAsString();
-        $errorMessage = $t->getMessage();
+        $errorFile     = $throwable->getFile();
+        $errorLine     = $throwable->getLine();
+        $traceAsString = $throwable->getTraceAsString();
+        $errorMessage  = $throwable->getMessage();
 
         return [
             'priority'     => $priority,
             'errorType'    => $errorType,
             'errorFile'    => $errorFile,
             'errorLine'    => $errorLine,
-            'trace'        => $trace,
+            'trace'        => $traceAsString,
             'errorMessage' => $errorMessage,
         ];
     }
@@ -180,22 +183,22 @@ private function isExists(
 
     private function sendMail(int $priority, string $errorMessage, array $extra, string $subject): void
     {
-        if (! $this->mailMessageService || ! $this->mailMessageTransport) {
+        if (! $this->message || ! $this->mailMessageTransport) {
             return;
         }
 
         if (! $this->emailReceivers) {
             return;
         }
 
-        $this->mailMessageService->setFrom($this->emailSender);
-        $this->mailMessageService->setSubject($subject);
+        $this->message->setFrom($this->emailSender);
+        $this->message->setSubject($subject);
 
         $filesData = $extra['request_data']['files_data'] ?? [];
-        foreach ($this->emailReceivers as $email) {
-            $this->mailMessageService->setTo($email);
+        foreach ($this->emailReceivers as $emailReceiver) {
+            $this->message->setTo($emailReceiver);
             $writer = new Mail(
-                $this->mailMessageService,
+                $this->message,
                 $this->mailMessageTransport,
                 $filesData
             );
@@ -206,9 +209,9 @@ private function sendMail(int $priority, string $errorMessage, array $extra, str
         }
     }
 
-    public function handleErrorException(Throwable $t, RequestInterface $request): void
+    public function handleErrorException(Throwable $throwable, RequestInterface $request): void
     {
-        $collectedExceptionData = $this->collectErrorExceptionData($t);
+        $collectedExceptionData = $this->collectErrorExceptionData($throwable);
         $extra                  = $this->collectErrorExceptionExtraData($collectedExceptionData, $request);
         $serverUrl              = $extra['server_url'];
 
diff --git a/src/Handler/Writer/Checker/Db.php b/src/Handler/Writer/Checker/Db.php
@@ -31,18 +31,18 @@ public function isExists(
         // db definition
         $db = Closure::bind(static fn($dbWriter) => $dbWriter->db, null, $this->dbWriter)($this->dbWriter);
 
-        foreach ($this->logWritersConfig as $writerConfig) {
-            if ($writerConfig['name'] === 'db') {
+        foreach ($this->logWritersConfig as $logWriterConfig) {
+            if ($logWriterConfig['name'] === 'db') {
                 // table definition
-                $table = $writerConfig['options']['table'];
+                $table = $logWriterConfig['options']['table'];
 
                 // columns definition
-                $timestamp  = $writerConfig['options']['column']['timestamp'];
-                $message    = $writerConfig['options']['column']['message'];
-                $file       = $writerConfig['options']['column']['extra']['file'];
-                $line       = $writerConfig['options']['column']['extra']['line'];
-                $url        = $writerConfig['options']['column']['extra']['url'];
-                $error_type = $writerConfig['options']['column']['extra']['error_type'];
+                $timestamp  = $logWriterConfig['options']['column']['timestamp'];
+                $message    = $logWriterConfig['options']['column']['message'];
+                $file       = $logWriterConfig['options']['column']['extra']['file'];
+                $line       = $logWriterConfig['options']['column']['extra']['line'];
+                $url        = $logWriterConfig['options']['column']['extra']['url'];
+                $error_type = $logWriterConfig['options']['column']['extra']['error_type'];
 
                 $tableGateway = new TableGateway($table, $db, null, new ResultSet());
                 $select       = $tableGateway->getSql()->select();
diff --git a/src/Handler/Writer/Mail.php b/src/Handler/Writer/Mail.php
@@ -30,11 +30,11 @@ class Mail extends BaseMail
      * @throws LogException\InvalidArgumentException
      */
     public function __construct(
-        MailMessage $mail,
+        MailMessage $mailMessage,
         TransportInterface $transport,
         private array $filesData
     ) {
-        parent::__construct($mail, $transport);
+        parent::__construct($mailMessage, $transport);
     }
 
     /**
@@ -83,28 +83,28 @@ public function shutdown(): void
         }
     }
 
-    private function bodyAddPart(MimeMessage $body, array $data): MimeMessage
+    private function bodyAddPart(MimeMessage $mimeMessage, array $data): MimeMessage
     {
-        foreach ($data as $upload) {
-            if (key($upload) === 'name' && ! is_array($upload['name'])) {
-                $body = $this->singleBodyAddPart($body, $upload);
+        foreach ($data as $singleData) {
+            if (key($singleData) === 'name' && ! is_array($singleData['name'])) {
+                $mimeMessage = $this->singleBodyAddPart($mimeMessage, $singleData);
                 continue;
             }
 
-            $body = $this->bodyAddPart($body, $upload);
+            $mimeMessage = $this->bodyAddPart($mimeMessage, $singleData);
         }
 
-        return $body;
+        return $mimeMessage;
     }
 
-    private function singleBodyAddPart(MimeMessage $body, array $data): MimeMessage
+    private function singleBodyAddPart(MimeMessage $mimeMessage, array $data): MimeMessage
     {
         $mimePart              = new Part(fopen($data['tmp_name'], 'r'));
         $mimePart->type        = $data['type'];
         $mimePart->filename    = $data['name'];
         $mimePart->disposition = Mime::DISPOSITION_ATTACHMENT;
         $mimePart->encoding    = Mime::ENCODING_BASE64;
 
-        return $body->addPart($mimePart);
+        return $mimeMessage->addPart($mimePart);
     }
 }
diff --git a/src/HeroFunction.php b/src/HeroFunction.php
@@ -23,16 +23,16 @@ function isExcludedException(array $excludeExceptionsConfig, Throwable $t): bool
     $exceptionOrErrorClass = $t::class;
 
     $isExcluded = false;
-    foreach ($excludeExceptionsConfig as $excludeException) {
-        if ($exceptionOrErrorClass === $excludeException) {
+    foreach ($excludeExceptionsConfig as $excludeExceptionConfig) {
+        if ($exceptionOrErrorClass === $excludeExceptionConfig) {
             $isExcluded = true;
             break;
         }
 
         if (
-            is_array($excludeException)
-            && $excludeException[0] === $exceptionOrErrorClass
-            && $excludeException[1] === $t->getMessage()
+            is_array($excludeExceptionConfig)
+            && $excludeExceptionConfig[0] === $exceptionOrErrorClass
+            && $excludeExceptionConfig[1] === $t->getMessage()
         ) {
             $isExcluded = true;
             break;
diff --git a/src/Listener/Mvc.php b/src/Listener/Mvc.php
@@ -29,30 +29,30 @@ class Mvc extends AbstractListenerAggregate
     public function __construct(
         private array $errorHeroModuleConfig,
         private Logging $logging,
-        private PhpRenderer $renderer
+        private PhpRenderer $phpRenderer
     ) {
     }
 
     /**
      * @param int $priority
      */
-    public function attach(EventManagerInterface $events, $priority = 1): void
+    public function attach(EventManagerInterface $eventManager, $priority = 1): void
     {
         if (! $this->errorHeroModuleConfig['enable']) {
             return;
         }
 
         // exceptions
-        $this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'exceptionError']);
-        $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'exceptionError'], 100);
+        $this->listeners[] = $eventManager->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'exceptionError']);
+        $this->listeners[] = $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'exceptionError'], 100);
 
         // php errors
-        $this->listeners[] = $events->attach(MvcEvent::EVENT_BOOTSTRAP, [$this, 'phpError']);
+        $this->listeners[] = $eventManager->attach(MvcEvent::EVENT_BOOTSTRAP, [$this, 'phpError']);
     }
 
-    public function exceptionError(MvcEvent $e): void
+    public function exceptionError(MvcEvent $mvcEvent): void
     {
-        $exception = $e->getParam('exception');
+        $exception = $mvcEvent->getParam('exception');
         if (! $exception) {
             return;
         }
@@ -67,7 +67,7 @@ public function exceptionError(MvcEvent $e): void
 
         $this->logging->handleErrorException(
             $exception,
-            $request = $e->getRequest()
+            $request = $mvcEvent->getRequest()
         );
 
         if ($this->errorHeroModuleConfig['display-settings']['display_errors']) {
@@ -76,21 +76,21 @@ public function exceptionError(MvcEvent $e): void
         }
 
         // show default view if display_errors setting = 0.
-        $this->showDefaultView($e, $request);
+        $this->showDefaultView($mvcEvent, $request);
     }
 
-    private function showDefaultView(MvcEvent $e, RequestInterface $request): void
+    private function showDefaultView(MvcEvent $mvcEvent, RequestInterface $request): void
     {
         if ($request instanceof Request) {
-            $response = $e->getResponse();
+            $response = $mvcEvent->getResponse();
             Assert::isInstanceOf($response, Response::class);
             $response->setStatusCode(500);
 
-            $application    = $e->getApplication();
-            $events         = $application->getEventManager();
-            $serviceManager = $application->getServiceManager();
-            $serviceManager->get('SendResponseListener')
-                           ->detach($events);
+            $application    = $mvcEvent->getApplication();
+            $eventManager   = $application->getEventManager();
+            $serviceLocator = $application->getServiceManager();
+            $serviceLocator->get('SendResponseListener')
+                           ->detach($eventManager);
 
             $isXmlHttpRequest = $request->isXmlHttpRequest();
             if (
@@ -107,14 +107,14 @@ private function showDefaultView(MvcEvent $e, RequestInterface $request): void
                 return;
             }
 
-            $layout = $e->getViewModel();
-            $layout->setTemplate($this->errorHeroModuleConfig['display-settings']['template']['layout']);
-            $layout->setVariable(
-                $layout->captureTo(),
-                $this->renderer->render($this->errorHeroModuleConfig['display-settings']['template']['view'])
+            $model = $mvcEvent->getViewModel();
+            $model->setTemplate($this->errorHeroModuleConfig['display-settings']['template']['layout']);
+            $model->setVariable(
+                $model->captureTo(),
+                $this->phpRenderer->render($this->errorHeroModuleConfig['display-settings']['template']['view'])
             );
 
-            $response->setContent($this->renderer->render($layout));
+            $response->setContent($this->phpRenderer->render($model));
             $response->send();
 
             return;
diff --git a/src/Middleware/Mezzio.php b/src/Middleware/Mezzio.php
diff --git a/src/Middleware/Routed/Preview/ErrorPreviewAction.php b/src/Middleware/Routed/Preview/ErrorPreviewAction.php
diff --git a/src/Module.php b/src/Module.php
