SKD-5377: Introduce ENV array element manifest type / phpstan fixes

spryker-sdk · Nov 24, 2023 · 36e4e34 · 36e4e34
1 parent 24376b5
commit 36e4e34
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/src/Builder/ClassModifier/ConfigFile/ConfigFileModifier.php b/src/Builder/ClassModifier/ConfigFile/ConfigFileModifier.php
@@ -43,10 +43,13 @@ public function addArrayItemToEnvConfig(
     ): FileInformationTransfer {
         $valueStm = $this->expressionPartialParser->parse(sprintf('$var = %s;', $value));
 
-        /** @var \PhpParser\Node\Stmt\Class_|null $node */
+        /** @var \PhpParser\Node\Expr\ArrayItem|null $arrayItem */
         $arrayItem = (new NodeFinder())->findFirst($valueStm, function (Node $node) {
             return $node instanceof ArrayItem;
         });
+        if (!$arrayItem) {
+            return $fileInformationTransfer;
+        }
 
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor(new AddArrayItemToEnvConfigVisitor($target, $arrayItem));

diff --git a/src/Builder/Extractor/ValueExtractor/AbstractValueExtractorStrategy.php b/src/Builder/Extractor/ValueExtractor/AbstractValueExtractorStrategy.php
@@ -108,6 +108,6 @@ protected function createArrayStringFromResult(array $array): string
      */
     protected function isConstant(string $value): bool
     {
-        return strpos($value, '::');
+        return (bool)strpos($value, '::');
     }
 }
diff --git a/src/Builder/Extractor/ValueExtractor/ArrayDimValueExtractor.php b/src/Builder/Extractor/ValueExtractor/ArrayDimValueExtractor.php
@@ -39,7 +39,10 @@ public function extractValue(
         $variable = $expression->var;
         /** @var \PhpParser\Node\Identifier $varName */
         $varName = $variable->name;
-        $key = $valueExtractorStrategyCollection->execute($expression->dim);
+        /** @var \PhpParser\Node\Expr $dim */
+        $dim = $expression->dim;
+
+        $key = $valueExtractorStrategyCollection->execute($dim);
 
         return new ExtractedValueTransfer(sprintf('$%s[%s]', $varName, $key->getValue()), true);
     }

diff --git a/src/Builder/Extractor/ValueExtractor/ArrayValueExtractorStrategy.php b/src/Builder/Extractor/ValueExtractor/ArrayValueExtractorStrategy.php
@@ -38,6 +38,7 @@ public function extractValue(
         ValueExtractorStrategyCollection $valueExtractorStrategyCollection
     ): ExtractedValueTransfer {
         $array = [];
+        /** @var \PhpParser\Node\Expr\ArrayItem $item */
         foreach ($expression->items as $key => $item) {
             if (!$item->key) {
                 $array[] = $valueExtractorStrategyCollection->execute($item->value)->getValue();

diff --git a/src/Builder/Extractor/ValueExtractor/StaticFuncCallValueExtractorStrategy.php b/src/Builder/Extractor/ValueExtractor/StaticFuncCallValueExtractorStrategy.php
@@ -49,8 +49,13 @@ public function extractValue(
             }
         }
 
+        /** @var \PhpParser\Node\Name $class */
+        $class = $expression->class;
+        /** @var \PhpParser\Node\Identifier $name */
+        $name = $expression->name;
+
         return new ExtractedValueTransfer(
-            sprintf('%s::%s(%s)', $this->getCalleeName($expression->class->parts), $expression->name->name, implode(', ', $arguments)),
+            sprintf('%s::%s(%s)', $this->getCalleeName($class->parts), $name->name, implode(', ', $arguments)),
             true,
         );
     }

diff --git a/src/Builder/Extractor/ValueExtractor/ValueExtractorStrategyCollection.php b/src/Builder/Extractor/ValueExtractor/ValueExtractorStrategyCollection.php
@@ -71,8 +71,10 @@ protected function getStrategies(): array
             return $this->strategiesCache;
         }
 
-        foreach (static::STRATEGIES as $strategy) {
-            $this->strategiesCache[] = new $strategy();
+        foreach (static::STRATEGIES as $strategyClass) {
+            /** @var \SprykerSdk\Integrator\Builder\Extractor\ValueExtractor\ValueExtractorStrategyInterface $strategy */
+            $strategy = new $strategyClass();
+            $this->strategiesCache[] = $strategy;
         }
 
         return $this->strategiesCache;

diff --git a/src/Builder/Extractor/ValueExtractor/VariableExtractorStrategy.php b/src/Builder/Extractor/ValueExtractor/VariableExtractorStrategy.php
@@ -35,6 +35,6 @@ public function extractValue(
         Expr $expression,
         ValueExtractorStrategyCollection $valueExtractorStrategyCollection
     ): ExtractedValueTransfer {
-        return new ExtractedValueTransfer(sprintf('$%s', (string)$expression->name), true);
+        return new ExtractedValueTransfer(sprintf('$%s', is_string($expression->name) ? $expression->name : 'var'), true);
     }
 }
diff --git a/src/Builder/Visitor/AddArrayItemToEnvConfigVisitor.php b/src/Builder/Visitor/AddArrayItemToEnvConfigVisitor.php
@@ -27,7 +27,7 @@ class AddArrayItemToEnvConfigVisitor extends NodeVisitorAbstract
     protected $target;
 
     /**
-     * @var array<\PhpParser\Node>
+     * @var \PhpParser\Node\Expr\ArrayItem
      */
     protected $value;