Merge pull request #80 from infocyph/feature/di-update

cache dir

Author: abmmhasan

src/Cache/Adapter/FileCacheAdapter.php

@@ -53,27 +53,57 @@ public function setNamespaceAndDirectory(string $namespace, ?string $baseDir = n
      *
      * @param string $ns   The namespace to use for the directory name, sanitized to allow only
      *                     alphanumeric characters, underscores, and hyphens.
-     * @param string|null $base The base directory where the cache directory will be created.
+     * @param string|null $baseDir The base directory where the cache directory will be created.
      *                          Defaults to the system's temporary directory if null.
      *
      * @throws RuntimeException If the directory cannot be created or is not writable, or if a
      *                          file with the same name already exists.
      */
-    private function createDirectory(string $ns, ?string $base): void
+    private function createDirectory(string $ns, ?string $baseDir): void
     {
-        $base = rtrim($base ?? sys_get_temp_dir(), DIRECTORY_SEPARATOR);
-        $ns = preg_replace('/[^A-Za-z0-9_\-]/', '_', $ns);
-        $this->dir = "$base/cache_$ns/";
+        $baseDir = rtrim($baseDir ?? sys_get_temp_dir(), DIRECTORY_SEPARATOR);
+        $ns      = preg_replace('/[^A-Za-z0-9_\-]/', '_', $ns);
+        $this->dir = $baseDir . DIRECTORY_SEPARATOR . 'cache_' . $ns . DIRECTORY_SEPARATOR;
+
+        if (is_dir($this->dir)) {
+            if (!is_writable($this->dir)) {
+                throw new RuntimeException(
+                    "Cache directory '$this->dir' exists but is not writable"
+                );
+            }
+            return;
+        }
+
+        if (file_exists($baseDir) && !is_dir($baseDir)) {
+            throw new RuntimeException(
+                'Cache base path ' . realpath($baseDir) . ' exists and is *not* a directory'
+            );
+        }
+
+        if (!is_dir($baseDir) && !@mkdir($baseDir, 0770, true) && !is_dir($baseDir)) {
+            $err = error_get_last()['message'] ?? 'unknown error';
+            throw new RuntimeException(
+                'Failed to create base directory ' . $baseDir . ": $err"
+            );
+        }
 
         if (file_exists($this->dir) && !is_dir($this->dir)) {
-            throw new RuntimeException("'$this->dir' exists and is not a directory");
+            throw new RuntimeException(
+                realpath($this->dir) . ' exists and is not a directory'
+            );
         }
-        if (!is_dir($this->dir) && !@mkdir($this->dir, 0770, true)) {
+
+        if (!@mkdir($this->dir, 0770, true) && !is_dir($this->dir)) {
             $err = error_get_last()['message'] ?? 'unknown error';
-            throw new RuntimeException("Failed to create '{$this->dir}': {$err}");
+            throw new RuntimeException(
+                'Failed to create cache directory ' . $this->dir . ": $err"
+            );
         }
+
         if (!is_writable($this->dir)) {
-            throw new RuntimeException("Cache directory '{$this->dir}' is not writable");
+            throw new RuntimeException(
+                'Cache directory ' . $this->dir . ' is not writable'
+            );
         }
     }
 

src/DI/Resolver/ParameterResolver.php

@@ -58,20 +58,46 @@ public function setClassResolverInstance(ClassResolver $classResolver): void
      * of the supplied parameters to create a unique identifier.
      *
      * @param ReflectionFunctionAbstract $reflector The reflection object representing the function/method.
-     * @param array $suppliedParameters The parameters supplied for the function/method call.
+     * @param array $supplied The parameters supplied for the function/method call.
      * @param string $type A string indicating the type of operation or context.
      * @return string A unique cache key for the given function/method resolution.
      */
     private function makeResolutionCacheKey(
         ReflectionFunctionAbstract $reflector,
-        array $suppliedParameters,
+        array $supplied,
         string $type,
     ): string {
         $owner = $reflector->class ?? '';
-        $argsHash = hash('xxh3', serialize($suppliedParameters));
+        $norm = array_map([self::class, 'normalise'], $supplied);
+        $argsHash = hash('xxh3', json_encode($norm, JSON_UNESCAPED_SLASHES));
+
         return "$owner::{$reflector->getName()}|$type|$argsHash";
     }
 
+    /**
+     * Normalizes a given value into a string or recursively normalizes arrays.
+     *
+     * This function converts different types of values into unique string representations:
+     * - Closures are represented by their object ID.
+     * - Objects are represented by their object ID.
+     * - Resources are represented by their type and ID.
+     * - Arrays are recursively normalized.
+     * - Other types returned as-is.
+     *
+     * @param mixed $value The value to be normalized.
+     * @return mixed The normalized value, either as a string or recursively normalized array.
+     */
+    private static function normalise(mixed $value): mixed
+    {
+        return match (true) {
+            $value instanceof \Closure => 'closure#' . spl_object_id($value),
+            is_object($value) => 'obj#' . spl_object_id($value),
+            is_resource($value) => 'res#' . get_resource_type($value) . '#' . (int)$value,
+            is_array($value) => array_map([self::class, 'normalise'], $value),
+            default => $value,
+        };
+    }
+
     /**
      * Retrieves the Infuse attributes for the given function/method reflection.
      *