Caching WiP

MartinMystikJonas · MartinMystikJonas · commit 5305850b4fe9 · 2025-07-30T19:31:34.000+02:00
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 build: cs tests phpstan
 
 tests:
-	php vendor/bin/phpunit
+	rm -rf tmp/* && php vendor/bin/phpunit
 
 cs:
 	vendor/bin/phpcs src tests --standard=vendor/efabrica/coding-standard/eFabrica --extensions="php" -n
diff --git a/src/Analyser/LatteContextAnalyser.php b/src/Analyser/LatteContextAnalyser.php
@@ -84,22 +84,19 @@ public function analyseFiles(array $files): LatteContextData
             $relatedFiles = [];
             foreach ($files as $file) {
                 $fileResult = $this->loadLatteContextDataFromCache($file);
-                if(!$fileResult) {
-					$fileResult = $this->analyseFile($file);
-					if ($fileResult->getErrors() === []) {
+                if (!$fileResult) {
+                    $fileResult = $this->analyseFile($file);
+                    if ($fileResult->getErrors() === []) {
                         $this->saveLatteContextDataToCache($file, $fileResult);
-                        $this->loadLatteContextDataFromCache($file);
+                    } else {
+                        $errors = array_merge($errors, $fileResult->getErrors());
                     }
-				}
-                if ($fileResult->getErrors() !== []) {
-                    $errors = array_merge($errors, $fileResult->getErrors());
                 }
                 if ($fileResult->getAllCollectedData() !== []) {
                     $collectedData = array_merge($collectedData, $fileResult->getAllCollectedData());
                     $processedFiles = array_unique(array_merge($processedFiles, $fileResult->getProcessedFiles()));
                     $relatedFiles = array_unique(array_merge($relatedFiles, $fileResult->getRelatedFiles()));
                 }
-
             }
             $files = array_diff($relatedFiles, $processedFiles);
         } while (count($files) > 0);
@@ -209,14 +206,14 @@ private function saveLatteContextDataToCache(string $file, LatteContextData $fil
         $cacheFile = $this->cacheFilename($file);
 
         try {
-			$data = $fileResult->jsonSerialize();
-		} catch (InvalidArgumentException $e) {
-			// Cannot serialize data, skip caching
-			if(is_file($cacheFile)) {
-				FileSystem::delete($cacheFile);
-			}
-			return;
-		}
+            $data = $fileResult->jsonSerialize();
+        } catch (InvalidArgumentException $e) {
+            // Cannot serialize data, skip caching
+            if (is_file($cacheFile)) {
+                FileSystem::delete($cacheFile);
+            }
+            return;
+        }
 
         $cacheData = [
             'file' => $file,
@@ -245,9 +242,9 @@ private function loadLatteContextDataFromCache(string $file): ?LatteContextData
         try {
             $cacheData = Json::decode(Filesystem::read($cacheFile), true);
         } catch (Exception) {
-			FileSystem::delete($cacheFile);
-			return null;
-		}
+            FileSystem::delete($cacheFile);
+            return null;
+        }
 
         if (!is_array($cacheData) || !isset($cacheData['file'], $cacheData['fileHash'], $cacheData['data'])) {
             FileSystem::delete($cacheFile);
@@ -276,9 +273,9 @@ private function loadLatteContextDataFromCache(string $file): ?LatteContextData
 
         try {
             return LatteContextData::fromJson($cacheData['data'], $this->typeStringResolver);
-		} catch (Exception) {
-		    FileSystem::delete($cacheFile);
-	        return null;
+        } catch (Exception) {
+            FileSystem::delete($cacheFile);
+            return null;
         }
     }
 }
diff --git a/src/Analyser/LatteContextData.php b/src/Analyser/LatteContextData.php
@@ -8,7 +8,6 @@
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedLatteContextObject;
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedRelatedFiles;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
diff --git a/src/LatteContext/CollectedData/CollectedComponent.php b/src/LatteContext/CollectedData/CollectedComponent.php
@@ -7,7 +7,6 @@
 use Efabrica\PHPStanLatte\Template\Component;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Analyser\NameScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Type\Type;
diff --git a/src/LatteContext/CollectedData/CollectedError.php b/src/LatteContext/CollectedData/CollectedError.php
@@ -5,7 +5,6 @@
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
 use PhpParser\Node;
-use PHPStan\Analyser\NameScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
diff --git a/src/LatteContext/CollectedData/CollectedFilter.php b/src/LatteContext/CollectedData/CollectedFilter.php
@@ -5,7 +5,6 @@
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
 use Efabrica\PHPStanLatte\Template\Filter;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
 final class CollectedFilter extends CollectedLatteContextObject
diff --git a/src/LatteContext/CollectedData/CollectedMethod.php b/src/LatteContext/CollectedData/CollectedMethod.php
@@ -4,7 +4,6 @@
 
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
diff --git a/src/LatteContext/CollectedData/CollectedMethodCall.php b/src/LatteContext/CollectedData/CollectedMethodCall.php
@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Analyser\NameScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\ClassReflection;
diff --git a/src/LatteContext/CollectedData/CollectedRelatedFiles.php b/src/LatteContext/CollectedData/CollectedRelatedFiles.php
@@ -4,7 +4,6 @@
 
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
 final class CollectedRelatedFiles extends CollectedLatteContextObject
diff --git a/src/LatteContext/CollectedData/CollectedTemplatePath.php b/src/LatteContext/CollectedData/CollectedTemplatePath.php
@@ -4,7 +4,6 @@
 
 namespace Efabrica\PHPStanLatte\LatteContext\CollectedData;
 
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
 final class CollectedTemplatePath extends CollectedLatteContextObject
diff --git a/src/LatteContext/CollectedData/CollectedTemplateRender.php b/src/LatteContext/CollectedData/CollectedTemplateRender.php
@@ -8,7 +8,6 @@
 use Efabrica\PHPStanLatte\Template\Variable;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Analyser\NameScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
diff --git a/src/LatteContext/CollectedData/CollectedVariable.php b/src/LatteContext/CollectedData/CollectedVariable.php
@@ -7,7 +7,6 @@
 use Efabrica\PHPStanLatte\Template\Variable;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Analyser\NameScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Type\Type;
diff --git a/src/LatteContext/CollectedData/Form/CollectedForm.php b/src/LatteContext/CollectedData/Form/CollectedForm.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedLatteContextObject;
 use Efabrica\PHPStanLatte\Template\Form\Form;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Type\Type;
 
diff --git a/src/LatteContext/CollectedData/Form/CollectedFormControl.php b/src/LatteContext/CollectedData/Form/CollectedFormControl.php
@@ -7,7 +7,6 @@
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedLatteContextObject;
 use Efabrica\PHPStanLatte\Template\Form\ControlInterface;
 use Efabrica\PHPStanLatte\Template\Form\Form;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
 final class CollectedFormControl extends CollectedLatteContextObject
diff --git a/src/LatteContext/CollectedData/Form/CollectedFormGroup.php b/src/LatteContext/CollectedData/Form/CollectedFormGroup.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\LatteContext\CollectedData\CollectedLatteContextObject;
 use Efabrica\PHPStanLatte\Template\Form\Group;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 
 final class CollectedFormGroup extends CollectedLatteContextObject
diff --git a/src/LatteContext/Collector/ComponentCollector.php b/src/LatteContext/Collector/ComponentCollector.php
@@ -168,6 +168,7 @@ private function findAssignToThis(Assign $node, Scope $scope, ClassReflection $c
      */
     private function buildComponents(Node $node, Scope $scope, ClassReflection $classReflection, Expr $componentNameArg, Expr $componentArg): ?array
     {
+    print_r(['buildcomp']);
         $lattePhpDoc = $this->lattePhpDocResolver->resolveForNode($node, $scope);
         if ($lattePhpDoc->isIgnored()) {
             return null;
@@ -219,8 +220,11 @@ private function buildComponents(Node $node, Scope $scope, ClassReflection $clas
      */
     public function addSubcomponents(array $components): array
     {
+     print_r(['subscomponents', count($components)]);
         foreach ($components as $component) {
+            print_r(['class', \get_class($component->getComponentType()), $component->getComponentType() instanceof ObjectType ? $component->getComponentType()->getClassName() : '---']);
             if ($component->getComponentType() instanceof ObjectType && (new ObjectType('Nette\Application\UI\Multiplier'))->isSuperTypeOf($component->getComponentType())->yes()) {
+                print_r(['multiplier']);
                 $multiplierType = $component->getComponentType()->getAncestorWithClassName('Nette\Application\UI\Multiplier');
                 if ($multiplierType instanceof GenericObjectType) {
                     $subComponentType = $multiplierType->getTypes()[0] ?? null;
diff --git a/src/Template/Component.php b/src/Template/Component.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Type\TypeHelper;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
@@ -68,20 +67,14 @@ public function withType(Type $type): self
     #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
-       if($this->name === 'multiplier') {
-         print_r(['save', $this->name, \get_class($this->type), $this->getTypeAsString()]);
-       }
         return [
           'name' => $this->name,
-          'type' => TypeHelper::serializeType($this->type)
+          'type' => TypeHelper::serializeType($this->type),
         ];
     }
 
     public static function fromJson(array $data, TypeStringResolver $typeStringResolver): self
     {
-       if($data['name'] === 'multiplier') {
-         print_r(['load', $data['name'], \get_class($typeStringResolver->resolve($data['type'])), $data['type']]);
-       }
         return new self(
             $data['name'],
             $typeStringResolver->resolve($data['type'])
diff --git a/src/Template/Filter.php b/src/Template/Filter.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Type\TypeHelper;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
@@ -51,7 +50,7 @@ public function jsonSerialize()
     {
         return [
             'name' => $this->name,
-            'type' => TypeHelper::serializeType($this->type)
+            'type' => TypeHelper::serializeType($this->type),
         ];
     }
 
diff --git a/src/Template/Form/Container.php b/src/Template/Form/Container.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Template\Form\Behavior\ControlHolderBehavior;
 use Efabrica\PHPStanLatte\Type\TypeHelper;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
diff --git a/src/Template/Form/Field.php b/src/Template/Form/Field.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Template\NameTypeItem;
 use Efabrica\PHPStanLatte\Type\TypeHelper;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
diff --git a/src/Template/Form/Form.php b/src/Template/Form/Form.php
@@ -10,7 +10,6 @@
 use Efabrica\PHPStanLatte\Type\TypeHelper;
 use InvalidArgumentException;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
diff --git a/src/Template/Form/Group.php b/src/Template/Form/Group.php
@@ -7,7 +7,6 @@
 use Efabrica\PHPStanLatte\Template\Form\Behavior\ControlHolderBehavior;
 use Efabrica\PHPStanLatte\Template\NameItem;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use ReturnTypeWillChange;
 
diff --git a/src/Template/Template.php b/src/Template/Template.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Template\Form\Form;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use ReturnTypeWillChange;
 
diff --git a/src/Template/TemplateContext.php b/src/Template/TemplateContext.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Template\Form\Form;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use ReturnTypeWillChange;
 
diff --git a/src/Template/Variable.php b/src/Template/Variable.php
@@ -6,7 +6,6 @@
 
 use Efabrica\PHPStanLatte\Type\TypeHelper;
 use JsonSerializable;
-use PHPStan\Analyser\NameScope;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\Type;
@@ -68,9 +67,6 @@ public static function fromJson(array $data, TypeStringResolver $typeStringResol
     {
         $name = $data['name'];
         $type = $typeStringResolver->resolve($data['type'] ?? 'mixed');
-        if($name === 'generic') {
-          print_r([$data['name'], \get_class($type), $data['type']]);
-        }
         $mightBeUndefined = $data['undefined'] ?? false;
         return new self($name, $type, $mightBeUndefined);
     }
diff --git a/src/Type/TypeHelper.php b/src/Type/TypeHelper.php
@@ -4,8 +4,10 @@
 
 namespace Efabrica\PHPStanLatte\Type;
 
+use InvalidArgumentException;
 use PHPStan\PhpDocParser\Printer\Printer;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
@@ -16,10 +18,10 @@ final class TypeHelper
 {
     public static function resolveType(Type $type): Type
     {
-		$type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
-			if ($type instanceof StaticType) {
-				return $traverse($type->getStaticObjectType());
-			}
+        $type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
+            if ($type instanceof StaticType) {
+                return $traverse($type->getStaticObjectType());
+            }
             return $traverse($type);
         });
 
@@ -69,21 +71,20 @@ public static function resolveTemplateType(Type $type, string $declaringClass, ?
     }
 
     public static function serializeType(Type $type): string
-	{
-		$type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
-			if ($type instanceof StaticType) {
-				return $traverse($type->getStaticObjectType());
-			}
-			if ($type instanceof ErrorType) {
-				throw new \InvalidArgumentException('Cannot serialize ErrorType');
-			}
-
-			if ($type instanceof TemplateType) {
-				throw new \InvalidArgumentException('Cannot serialize TemplateType');
-			}
+    {
+        $type = TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {
+            if ($type instanceof StaticType) {
+                return $traverse($type->getStaticObjectType());
+            }
+            if ($type instanceof ErrorType) {
+                throw new InvalidArgumentException('Cannot serialize ErrorType');
+            }
+            if ($type instanceof TemplateType) {
+                throw new InvalidArgumentException('Cannot serialize TemplateType');
+            }
             return $traverse($type);
         });
 
-		return (new Printer())->print($type->toPhpDocNode());
-	}
+        return (new Printer())->print($type->toPhpDocNode());
+    }
 }
