fix: fix context creation and improve exception handling for administration

Author: M-arcus

src/Command/PluginChecksumCreateCommand.php

@@ -46,7 +46,8 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new ShopwareStyle($input, $output);
-        $context = Context::createCLIContext();
+        // @phpstan-ignore-next-line
+        $context = method_exists(Context::class, 'createCLIContext') ? Context::createCLIContext() : Context::createDefaultContext();
 
         $pluginName = (string) $input->getArgument('plugin');
         $plugin = $this->getPlugin($pluginName, $context);

src/Components/PluginChecksum/Struct/PluginChecksumCheckResult.php

@@ -14,6 +14,7 @@ class PluginChecksumCheckResult extends Struct
     public function __construct(
         protected bool $fileMissing = false,
         protected bool $wrongVersion = false,
+        protected bool $checkFailed = false,
         protected array $newFiles = [],
         protected array $changedFiles = [],
         protected array $missingFiles = [],
@@ -30,6 +31,11 @@ public function isWrongVersion(): bool
         return $this->wrongVersion;
     }
 
+    public function isCheckFailed(): bool
+    {
+        return $this->checkFailed;
+    }
+
     /**
      * @return string[]
      */

src/Controller/PluginFilesController.php

@@ -5,6 +5,8 @@
 namespace Frosh\Tools\Controller;
 
 use Frosh\Tools\Components\PluginChecksum\PluginFileHashService;
+use Frosh\Tools\Components\PluginChecksum\Struct\PluginChecksumCheckResult;
+use Psr\Log\LoggerInterface;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -24,6 +26,7 @@ class PluginFilesController extends AbstractController
     public function __construct(
         private readonly EntityRepository $pluginRepository,
         private readonly PluginFileHashService $pluginFileHashService,
+        private readonly LoggerInterface $froshToolsLogger,
     ) {
     }
 
@@ -35,12 +38,24 @@ public function listPluginFiles(Context $context): JsonResponse
         /** @var PluginCollection $plugins */
         $plugins = $this->pluginRepository->search(new Criteria(), $context)->getEntities();
         foreach ($plugins as $plugin) {
-            $pluginChecksumCheckResult = $this->pluginFileHashService->checkPluginForChanges($plugin);
-            if ($pluginChecksumCheckResult->getNewFiles() !== [] || $pluginChecksumCheckResult->getChangedFiles() !== [] || $pluginChecksumCheckResult->getMissingFiles() !== []) {
-                $pluginResults[$plugin->getName()] = $pluginChecksumCheckResult;
+            try {
+                $pluginChecksumCheckResult = $this->pluginFileHashService->checkPluginForChanges($plugin);
+                if ($pluginChecksumCheckResult->getNewFiles() !== [] || $pluginChecksumCheckResult->getChangedFiles() !== [] || $pluginChecksumCheckResult->getMissingFiles() !== []) {
+                    $pluginResults[$plugin->getName()] = $pluginChecksumCheckResult;
+                }
+            } catch (\Exception $exception) {
+                $pluginResults[$plugin->getName()] = new PluginChecksumCheckResult(checkFailed: true);
+                $this->froshToolsLogger->error('Error checking checksums for plugin {plugin}: {message}', [
+                    'plugin' => $plugin->getName(),
+                    'message' => $exception->getMessage(),
+                    'exception' => $exception,
+                ]);
             }
         }
 
-        return new JsonResponse(['success' => \count($pluginResults) === 0, 'pluginResults' => $pluginResults]);
+        return new JsonResponse([
+            'success' => \count($pluginResults) === 0,
+            'pluginResults' => $pluginResults,
+        ]);
     }
 }

src/Resources/app/administration/src/module/frosh-tools/component/frosh-tools-tab-files/template.twig

@@ -121,26 +121,40 @@
             </sw-button>
         </template>
         <div
-            v-for="(plugin, pluginName) in pluginItems.pluginResults"
+            v-for="(pluginResult, pluginName) in pluginItems.pluginResults"
         >
             <h4>{{ pluginName }}</h4>
-            <sw-description-list>
-                <dt v-if="plugin.newFiles.length > 0">
+            <sw-alert
+                variant="error"
+                v-if="pluginResult.checkFailed"
+            >
+                {{ $t('frosh-tools.tabs.pluginFiles.checkFailed') }}
+            </sw-alert>
+            <sw-description-list v-else>
+                <dt v-if="pluginResult.newFiles.length > 0">
                     {{ $t('frosh-tools.tabs.pluginFiles.newFiles') }}
                 </dt>
-                <dd v-for="file in plugin.newFiles">
+                <dd v-for="file in pluginResult.newFiles">
                     {{ file }}
                 </dd>
-                <dt v-if="plugin.changedFiles.length > 0">
+                <dt
+                    v-if="pluginResult.changedFiles.length > 0"
+                >
                     {{ $t('frosh-tools.tabs.pluginFiles.changedFiles') }}
                 </dt>
-                <dd v-for="file in plugin.changedFiles">
+                <dd
+                    v-for="file in pluginResult.changedFiles"
+                >
                     {{ file }}
                 </dd>
-                <dt v-if="plugin.missingFiles.length > 0">
+                <dt
+                    v-if="pluginResult.missingFiles.length > 0"
+                >
                     {{ $t('frosh-tools.tabs.pluginFiles.missingFiles') }}
                 </dt>
-                <dd v-for="file in plugin.missingFiles">
+                <dd
+                    v-for="file in pluginResult.missingFiles"
+                >
                     {{ file }}
                 </dd>
             </sw-description-list>

src/Resources/app/administration/src/module/frosh-tools/snippet/de-DE.json

@@ -64,8 +64,9 @@
             },
             "pluginFiles": {
                 "title": "Plugin Dateien Checker",
-                "allFilesOk": "Keine Plugins wurden manipuliert",
-                "notOk": "Es gibt Plugins, die manipuliert wurden",
+                "allFilesOk": "Keine Plugins wurden manipuliert.",
+                "notOk": "Es gibt Plugins, die manipuliert wurden.",
+                "checkFailed": "Das Plugin konnte nicht geprüft werden. Bitte prüfe die Logs.",
                 "newFiles": "Neue Dateien",
                 "changedFiles": "Geänderte Dateien",
                 "missingFiles": "Fehlende Dateien"

src/Resources/app/administration/src/module/frosh-tools/snippet/en-GB.json

@@ -64,8 +64,9 @@
             },
             "pluginFiles": {
                 "title": "Plugin File Checker",
-                "allFilesOk": "No plugins modified",
-                "notOk": "There are modified plugins",
+                "allFilesOk": "No plugins were modified.",
+                "notOk": "There are modified plugins.",
+                "checkFailed": "The plugin could not be checked. Please check the logs.",
                 "newFiles": "New files",
                 "changedFiles": "Changed files",
                 "missingFiles": "Missing files"