Implement writing and using cache

samdark · samdark · commit 2e94b3f4f314 · 2021-02-03T11:12:57.000+03:00
diff --git a/src/Config.php b/src/Config.php
@@ -64,7 +64,11 @@ private function buildGroup(string $group): void
             return;
         }
 
-        // TODO: get from cache here if cache exists
+        $cachePath = $this->cachePath . '/' . $group . '.php';
+        if ($this->useCache && file_exists($cachePath)) {
+            $this->build[$group] = $this->buildFile($group, $cachePath);
+            return;
+        }
 
         $this->build[$group] = [];
 
@@ -88,7 +92,8 @@ private function buildGroup(string $group): void
                     $matches = glob($path);
 
                     foreach ($matches as $match) {
-                        $this->buildFile($group, $match, [$file, $group, $packageName]);
+                        $buildConfig = $this->buildFile($group, $match);
+                        $this->build[$group] = $this->merge([$file, $group, $packageName], '', $this->build[$group], $buildConfig);
                     }
                     continue;
                 }
@@ -97,21 +102,21 @@ private function buildGroup(string $group): void
                     continue;
                 }
 
-                $this->buildFile($group, $path, [$file, $group, $packageName]);
+                $buildConfig = $this->buildFile($group, $path);
+                $this->build[$group] = $this->merge([$file, $group, $packageName], '', $this->build[$group], $buildConfig);
             }
         }
 
         if ($this->writeCache) {
-            // This is debug only. Export isn't working correctly (not exporting namespaces).
-            $filePath = $this->cachePath . '/' . $group . '.php';
-            file_put_contents($filePath, "<?php\n\ndeclare(strict_types=1);\n\nreturn " . VarDumper::create($this->build[$group])->export(true) . ";\n");
+            // TODO: export isn't working correctly (not exporting namespaces).
+            file_put_contents($cachePath, "<?php\n\ndeclare(strict_types=1);\n\nreturn " . VarDumper::create($this->build[$group])->export(true) . ";\n");
         }
     }
 
     /**
      * @psalm-param array{string, string, string} $context $context
      */
-    private function buildFile(string $group, string $filePath, array $context): void
+    private function buildFile(string $group, string $filePath): array
     {
         $scopeRequire = static function (Config $config): array {
             /** @psalm-suppress InvalidArgument, MissingClosureParamType */
@@ -136,8 +141,7 @@ private function buildFile(string $group, string $filePath, array $context): voi
         }
 
         /** @psalm-suppress TooManyArguments */
-        $config = $scopeRequire($this, $filePath, $scope);
-        $this->build[$group] = $this->merge($context, '', $this->build[$group], $config);
+        return $scopeRequire($this, $filePath, $scope);
     }
 
     public function get(string $name): array

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,11 @@ private function buildGroup(string $group): void`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`
`67`		`- // TODO: get from cache here if cache exists`
	`67`	`+ $cachePath = $this->cachePath . '/' . $group . '.php';`
	`68`	`+ if ($this->useCache && file_exists($cachePath)) {`
	`69`	`+ $this->build[$group] = $this->buildFile($group, $cachePath);`
	`70`	`+ return;`
	`71`	`+ }`
`68`	`72`
`69`	`73`	`$this->build[$group] = [];`
`70`	`74`
`@@ -88,7 +92,8 @@ private function buildGroup(string $group): void`
`88`	`92`	`$matches = glob($path);`
`89`	`93`
`90`	`94`	`foreach ($matches as $match) {`
`91`		`- $this->buildFile($group, $match, [$file, $group, $packageName]);`
	`95`	`+ $buildConfig = $this->buildFile($group, $match);`
	`96`	`+ $this->build[$group] = $this->merge([$file, $group, $packageName], '', $this->build[$group], $buildConfig);`
`92`	`97`	`}`
`93`	`98`	`continue;`
`94`	`99`	`}`
`@@ -97,21 +102,21 @@ private function buildGroup(string $group): void`
`97`	`102`	`continue;`
`98`	`103`	`}`
`99`	`104`
`100`		`- $this->buildFile($group, $path, [$file, $group, $packageName]);`
	`105`	`+ $buildConfig = $this->buildFile($group, $path);`
	`106`	`+ $this->build[$group] = $this->merge([$file, $group, $packageName], '', $this->build[$group], $buildConfig);`
`101`	`107`	`}`
`102`	`108`	`}`
`103`	`109`
`104`	`110`	`if ($this->writeCache) {`
`105`		`- // This is debug only. Export isn't working correctly (not exporting namespaces).`
`106`		`- $filePath = $this->cachePath . '/' . $group . '.php';`
`107`		`- file_put_contents($filePath, "<?php\n\ndeclare(strict_types=1);\n\nreturn " . VarDumper::create($this->build[$group])->export(true) . ";\n");`
	`111`	`+ // TODO: export isn't working correctly (not exporting namespaces).`
	`112`	`+ file_put_contents($cachePath, "<?php\n\ndeclare(strict_types=1);\n\nreturn " . VarDumper::create($this->build[$group])->export(true) . ";\n");`
`108`	`113`	`}`
`109`	`114`	`}`
`110`	`115`
`111`	`116`	`/**`
`112`	`117`	`* @psalm-param array{string, string, string} $context $context`
`113`	`118`	`*/`
`114`		`- private function buildFile(string $group, string $filePath, array $context): void`
	`119`	`+ private function buildFile(string $group, string $filePath): array`
`115`	`120`	`{`
`116`	`121`	`$scopeRequire = static function (Config $config): array {`
`117`	`122`	`/** @psalm-suppress InvalidArgument, MissingClosureParamType */`
`@@ -136,8 +141,7 @@ private function buildFile(string $group, string $filePath, array $context): voi`
`136`	`141`	`}`
`137`	`142`
`138`	`143`	`/** @psalm-suppress TooManyArguments */`
`139`		`- $config = $scopeRequire($this, $filePath, $scope);`
`140`		`- $this->build[$group] = $this->merge($context, '', $this->build[$group], $config);`
	`144`	`+ return $scopeRequire($this, $filePath, $scope);`
`141`	`145`	`}`
`142`	`146`
`143`	`147`	`public function get(string $name): array`