diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 43b02d7b..4cb99994 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -6,9 +6,11 @@
 
     <arg name="extensions" value="php,phtml"/>
 
-    <rule ref="Magento2">
-        <!-- Mago formats multi-line conditions PSR-12 style (newline after the
-             opening parenthesis); this PSR-2-era sniff would flag that. -->
-        <exclude name="PSR2.ControlStructures.ControlStructureSpacing"/>
-    </rule>
+    <!-- Full Magento2 standard, no exclusions: external package checkers run the
+         plain standard against the published package, so any local exclusion would
+         hide findings that still fail there. Multi-line conditions conflict with
+         Mago's PSR-12 wrapping (newline after the opening parenthesis, flagged by
+         PSR2.ControlStructures.ControlStructureSpacing) — keep conditions on one
+         line by extracting sub-expressions into variables instead. -->
+    <rule ref="Magento2"/>
 </ruleset>
diff --git a/src/Console/Command/System/CheckCommand.php b/src/Console/Command/System/CheckCommand.php
index f58e9ded..c304aaa7 100644
--- a/src/Console/Command/System/CheckCommand.php
+++ b/src/Console/Command/System/CheckCommand.php
@@ -163,12 +163,8 @@ private function getLatestLtsNodeVersion(): string
 
             /** @var array<int, array<string, mixed>> $nodes */
             foreach ($nodes as $node) {
-                if (
-                    isset($node['lts'])
-                    && $node['lts'] !== false
-                    && isset($node['version'])
-                    && is_string($node['version'])
-                ) {
+                $isLtsRelease = isset($node['lts']) && $node['lts'] !== false;
+                if ($isLtsRelease && isset($node['version']) && is_string($node['version'])) {
                     return trim($node['version'], 'v');
                 }
             }
diff --git a/src/Service/Hyva/ModuleScanner.php b/src/Service/Hyva/ModuleScanner.php
index aa2881aa..80cc771d 100644
--- a/src/Service/Hyva/ModuleScanner.php
+++ b/src/Service/Hyva/ModuleScanner.php
@@ -125,11 +125,11 @@ private function isHyvaCompatibilityPackage(array $composerData): bool
     {
         // Check if this IS a Hyvä compatibility package
         $packageName = $composerData['name'] ?? '';
-        if (
+        $isCompatPackage =
             is_string($packageName)
             && str_starts_with($packageName, 'hyva-themes/')
-            && str_contains($packageName, '-compat')
-        ) {
+            && str_contains($packageName, '-compat');
+        if ($isCompatPackage) {
             return true;
         }
 
diff --git a/src/Service/ThemeBuilder/HyvaThemes/Builder.php b/src/Service/ThemeBuilder/HyvaThemes/Builder.php
index 6d04b96f..0b65b3a9 100644
--- a/src/Service/ThemeBuilder/HyvaThemes/Builder.php
+++ b/src/Service/ThemeBuilder/HyvaThemes/Builder.php
@@ -68,12 +68,8 @@ public function detect(string $themePath): bool
         if ($this->fileDriver->isExists($themePath . '/composer.json')) {
             $composerContent = $this->fileDriver->fileGetContents($themePath . '/composer.json');
             $composerJson = json_decode($composerContent, true);
-            if (
-                is_array($composerJson)
-                && isset($composerJson['name'])
-                && is_string($composerJson['name'])
-                && str_contains($composerJson['name'], 'hyva')
-            ) {
+            $packageName = is_array($composerJson) ? $composerJson['name'] ?? null : null;
+            if (is_string($packageName) && str_contains($packageName, 'hyva')) {
                 return true;
             }
         }
diff --git a/src/Service/ThemeBuilder/TailwindCSS/Builder.php b/src/Service/ThemeBuilder/TailwindCSS/Builder.php
index 38cd9a5f..75f0ec94 100644
--- a/src/Service/ThemeBuilder/TailwindCSS/Builder.php
+++ b/src/Service/ThemeBuilder/TailwindCSS/Builder.php
@@ -68,12 +68,8 @@ public function detect(string $themePath): bool
         if ($this->fileDriver->isExists($themePath . '/composer.json')) {
             $composerContent = $this->fileDriver->fileGetContents($themePath . '/composer.json');
             $composerJson = json_decode($composerContent, true);
-            if (
-                \is_array($composerJson)
-                && isset($composerJson['name'])
-                && \is_string($composerJson['name'])
-                && !str_contains($composerJson['name'], 'hyva')
-            ) {
+            $packageName = \is_array($composerJson) ? $composerJson['name'] ?? null : null;
+            if (\is_string($packageName) && !str_contains($packageName, 'hyva')) {
                 return true;
             }
         }