Merge pull request #22 from netlogix/fix/matchingstatuscodes-position

fix: Sort NodeBasedConfiguration by length of pathPrefixes
netlogix · Oct 29, 2024 · dbfc89c · dbfc89c
2 parents 45e35c3 + 429fba0
commit dbfc89c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Classes/Command/ErrorPageCommandController.php b/Classes/Command/ErrorPageCommandController.php
@@ -147,7 +147,7 @@ public function generateCommand(bool $verbose = false)
     public function showConfigurationCommand()
     {
         $result = [
-            'Neltogix' => [
+            'Netlogix' => [
                 'ErrorHandler' => [
                     'pages' => $this->configuration->getConfiguration()
               ]

diff --git a/Classes/Configuration/NodeBasedConfiguration.php b/Classes/Configuration/NodeBasedConfiguration.php
@@ -103,6 +103,9 @@ public function getConfiguration(): array
                     $this->throwableStorage->logThrowable($e);
                 }
             }
+
+            usort($configurationsForSite[$sitename], fn($a, $b) => $a['position'] <=> $b['position']);
+            $configurationsForSite[$sitename] = array_map(fn($item) => array_diff_key($item, ['position' => 0]), $configurationsForSite[$sitename]);
             $configurationsForSite[$sitename] = array_values($configurationsForSite[$sitename]);
         }
 
@@ -111,13 +114,20 @@ public function getConfiguration(): array
 
     public function getErrorNodeConfiguration(NodeInterface $errorNode): array
     {
+        $pathPrefixes = $this->extractPathPrefixes($errorNode);
+        $position = 1000;
+        foreach ($pathPrefixes as $pathPrefix) {
+            $position -= strlen($pathPrefix);
+        }
+
         return [
             'matchingStatusCodes' => $this->extractStatusCodes($errorNode),
             'dimensions' => $this->extractDimensions($errorNode),
             'dimensionPathSegment' => $this->extractDimensionsPathSegment($errorNode),
             'source' => '#' . $errorNode->getIdentifier(),
             'destination' => $this->destination,
-            'pathPrefixes' => $this->extractPathPrefixes($errorNode),
+            'pathPrefixes' => $pathPrefixes,
+            'position' => $position,
         ];
     }