feat: ecs, rector

Author: stefanpoensgen

…ts/Elasticsearch/AdminInfoSubscriber.php …rch/AdminInfoSubscriberEventListener.phpsrc/Components/Elasticsearch/AdminInfoSubscriber.php renamed to src/Components/Elasticsearch/AdminInfoSubscriberEventListener.php src/Components/Elasticsearch/AdminInfoSubscriber.php renamed to src/Components/Elasticsearch/AdminInfoSubscriberEventListener.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 
 #[AutoconfigureTag('kernel.event_listener')]
-final class AdminInfoSubscriber
+final class AdminInfoSubscriberEventListener
 {
     public function __construct(
         #[Autowire('%frosh_tools.elasticsearch.enabled%')] private readonly bool $elasticsearchEnabled

src/Components/Health/Checker/HealthChecker/MysqlChecker.php

@@ -18,7 +18,7 @@ public function collect(HealthCollection $collection): void
     {
         $version = $this->connection->fetchOne('SELECT VERSION()');
         if (!\is_string($version)) {
-            $collection->add(SettingsResult::error('mysql',  'MySQL Version', 'unknown'));
+            $collection->add(SettingsResult::error('mysql', 'MySQL Version', 'unknown'));
 
             return;
         }

src/Components/Health/Checker/HealthChecker/QueueChecker.php

@@ -25,7 +25,7 @@ public function collect(HealthCollection $collection): void
         /** @var string|false $oldestMessageAt */
         $oldestMessageAt = $this->connection->fetchOne('SELECT available_at FROM messenger_messages ORDER BY available_at ASC LIMIT 1');
 
-        if (is_string($oldestMessageAt)) {
+        if (\is_string($oldestMessageAt)) {
             $diff = round(abs(
                 ((new \DateTime($oldestMessageAt . ' UTC'))->getTimestamp() - $oldMessageLimit->getTimestamp()) / 60
             ));

src/Components/Health/Checker/HealthChecker/SystemInfoChecker.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Frosh\Tools\Components\Health\Checker\HealthChecker;
 
@@ -30,15 +31,16 @@ private function checkPath(HealthCollection $collection): void
         );
     }
 
-    private function getDatabaseInfo(HealthCollection $collection)
+    private function getDatabaseInfo(HealthCollection $collection): void
     {
         $databaseConnectionInfo = (new DatabaseConnectionInformation())->fromEnv();
 
         $collection->add(
             SettingsResult::ok(
                 'database-info',
                 'Database',
-                \sprintf('%s@%s:%s',
+                \sprintf(
+                    '%s@%s:%d',
                     $databaseConnectionInfo->getDatabaseName(),
                     $databaseConnectionInfo->getHostname(),
                     $databaseConnectionInfo->getPort()

src/Components/Health/Checker/HealthChecker/TaskChecker.php

@@ -59,6 +59,6 @@ public function collect(HealthCollection $collection): void
             ($maxTaskNextExecTime - $taskDateLimit->getTimestamp()) / 60
         ));
 
-        $collection->add(SettingsResult::warning('scheduled_task', 'Scheduled tasks', \sprintf('%d mins',$diff), $recommended));
+        $collection->add(SettingsResult::warning('scheduled_task', 'Scheduled tasks', \sprintf('%d mins', $diff), $recommended));
     }
 }

src/Components/Health/Checker/PerformanceChecker/MailOverQueueChecker.php

@@ -27,7 +27,6 @@ public function collect(HealthCollection $collection): void
                     'https://developer.shopware.com/docs/guides/hosting/infrastructure/message-queue#sending-mails-over-the-message-queue'
                 )
             );
-
         }
     }
 }

src/Controller/ShopwareFilesController.php

@@ -1,27 +1,29 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Frosh\Tools\Controller;
 
 use Shopware\Core\Kernel;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 #[Route(path: '/api/_action/frosh-tools', defaults: ['_routeScope' => ['api'], '_acl' => ['frosh_tools:read']])]
-class ShopwareFilesController
+class ShopwareFilesController extends AbstractController
 {
     private const STATUS_OK = 0;
     private const STATUS_IGNORED_ALL = 1;
     private const STATUS_IGNORED_IN_PROJECT = 2;
-    private bool $isPlatform;
+
+    private readonly bool $isPlatform;
 
     public function __construct(
         #[Autowire('%kernel.shopware_version%')] private readonly string $shopwareVersion,
-        #[Autowire('%kernel.project_dir%<')] private readonly string $projectDir,
-        #[Autowire('%frosh_tools.file_checker.exclude_files%')] private readonly array $projectIgnoredFiles
-    )
-    {
+        #[Autowire('%kernel.project_dir%')] private readonly string $projectDir,
+        #[Autowire('%frosh_tools.file_checker.exclude_files%')] private readonly array $projectExcludeFiles
+    ) {
         $this->isPlatform = !is_dir($this->projectDir . '/vendor/shopware/core') && is_dir($this->projectDir . '/src/Core');
     }
 
@@ -45,9 +47,7 @@ public function listShopwareFiles(): JsonResponse
 
         foreach (explode("\n", $data) as $row) {
             if ($this->isPlatform) {
-                $row = preg_replace_callback('/vendor\/shopware\/(.)/', function ($matches) {
-                    return 'src/' . strtoupper($matches[1]);
-                }, $row);
+                $row = preg_replace_callback('/vendor\/shopware\/(.)/', fn ($matches): string => 'src/' . strtoupper($matches[1]), $row);
             }
 
             [$expectedMd5Sum, $file] = explode('  ', trim($row));
@@ -77,8 +77,8 @@ public function listShopwareFiles(): JsonResponse
                 ];
             }
 
-            //WE SHOULD STOP HERE, WHILE THERE MIGHT BE ANY BIG PROBLEM!
-            if (count($invalidFiles) > 100) {
+            // WE SHOULD STOP HERE, WHILE THERE MIGHT BE ANY BIG PROBLEM!
+            if (\count($invalidFiles) > 100) {
                 break;
             }
         }
@@ -148,22 +148,18 @@ public function restoreShopwareFile(Request $request): JsonResponse
 
     private function getShopwareUrl(string $name): ?string
     {
-        if ($this->isPlatform) {
-            $name = preg_replace('/^src\//', '', $name);
-        } else {
-            $name = preg_replace('/^vendor\/shopware\//', '', $name);
-        }
+        $name = $this->isPlatform ? preg_replace('/^src\//', '', $name) : preg_replace('/^vendor\/shopware\//', '', $name);
 
         $pathParts = \explode('/', $name);
         $repo = $pathParts[0];
         array_shift($pathParts);
 
-        return 'https://github.com/shopware/' .
-            $repo .
-            '/blob/v' .
-            $this->shopwareVersion .
-            '/' .
-            \implode('/', $pathParts);
+        return 'https://github.com/shopware/'
+            . $repo
+            . '/blob/v'
+            . $this->shopwareVersion
+            . '/'
+            . \implode('/', $pathParts);
     }
 
     private function getOriginalFileContent(string $name): ?string
@@ -173,19 +169,10 @@ private function getOriginalFileContent(string $name): ?string
 
     private function isIgnoredFileHash(string $file): int
     {
-        if (in_array($file, $this->projectIgnoredFiles, true)) {
+        if (\in_array($file, $this->projectExcludeFiles, true)) {
             return self::STATUS_IGNORED_IN_PROJECT;
         }
 
         return self::STATUS_OK;
     }
-
-    private function assertNoGitVersion(): ?JsonResponse
-    {
-        if ($this->shopwareVersion === Kernel::SHOPWARE_FALLBACK_VERSION) {
-            return new JsonResponse(['error' => 'Git version is not supported']);
-        }
-
-        return null;
-    }
 }

src/DependencyInjection/Configuration.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Frosh\Tools\DependencyInjection;
 

src/DependencyInjection/FroshToolsExtension.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Frosh\Tools\DependencyInjection;
 
@@ -29,7 +30,6 @@ private function addConfig(ContainerBuilder $container, string $alias, array $op
             }
         }
 
-        /** @phpstan-ignore-next-line */
         if (!$container->hasParameter('frosh_tools.file_checker.exclude_files')) {
             $container->setParameter('frosh_tools.file_checker.exclude_files', []);
         }

src/FroshTools.php

@@ -5,8 +5,8 @@
 
 use Frosh\Tools\DependencyInjection\CacheCompilerPass;
 use Frosh\Tools\DependencyInjection\DisableElasticsearchCompilerPass;
-use Frosh\Tools\DependencyInjection\SymfonyConfigCompilerPass;
 use Frosh\Tools\DependencyInjection\FroshToolsExtension;
+use Frosh\Tools\DependencyInjection\SymfonyConfigCompilerPass;
 use Shopware\Core\Framework\Plugin;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -20,7 +20,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new DisableElasticsearchCompilerPass());
     }
 
-    public function createContainerExtension(): FroshToolsExtension
+    protected function createContainerExtension(): FroshToolsExtension
     {
         return new FroshToolsExtension();
     }