Remove path resolver

cycle · Feb 2, 2024 · 545495e · 545495e
1 parent 67f1cf2
commit 545495e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 51 deletions.
diff --git a/src/FromFilesSchemaProvider.php b/src/FromFilesSchemaProvider.php
@@ -6,8 +6,6 @@
 
 use Cycle\Schema\Provider\Exception\ConfigurationException;
 use Cycle\Schema\Provider\Exception\SchemaFileNotFoundException;
-use Cycle\Schema\Provider\Path\ResolverInterface;
-use Cycle\Schema\Provider\Path\SimpleResolver;
 use Webmozart\Glob\Glob;
 use Webmozart\Glob\Iterator\GlobIterator;
 use Cycle\Schema\Provider\Support\SchemaMerger;
@@ -27,11 +25,20 @@ final class FromFilesSchemaProvider implements SchemaProviderInterface
  */
  private bool $strict = false;
 
- private ResolverInterface $pathResolver;
+ /**
+ * @var \Closure(non-empty-string): non-empty-string
+ */
+ private \Closure $pathResolver;
 
- public function __construct(?ResolverInterface $resolver = null)
+ /**
+ * @param null|callable(non-empty-string): non-empty-string $pathResolver A function that resolves
+ * framework-specific file paths.
+ */
+ public function __construct(?callable $pathResolver = null)
  {
- $this->pathResolver = $resolver ?? new SimpleResolver();
+ $this->pathResolver = $pathResolver === null
+ ? static fn (string $path): string => $path
+ : \Closure::fromCallable($pathResolver);
  }
 
  public function withConfig(array $config): self
@@ -54,7 +61,7 @@ function ($file) {
  if (!\is_string($file)) {
  throw new ConfigurationException('The `files` parameter must contain string values.');
  }
- return $this->pathResolver->resolve($file);
+ return ($this->pathResolver)($file);
  },
  $files
  );

diff --git a/src/Path/ResolverInterface.php b/src/Path/ResolverInterface.php
diff --git a/src/Path/SimpleResolver.php b/src/Path/SimpleResolver.php
diff --git a/src/PhpFileSchemaProvider.php b/src/PhpFileSchemaProvider.php
@@ -4,7 +4,6 @@
 
 namespace Cycle\Schema\Provider;
 
-use Closure;
 use Cycle\Schema\Provider\Exception\ConfigurationException;
 use Cycle\Schema\Provider\Exception\SchemaProviderException;
 use Cycle\Schema\Renderer\PhpSchemaRenderer;
@@ -19,8 +18,10 @@ final class PhpFileSchemaProvider implements SchemaProviderInterface
  private string $file = '';
  private int $mode = self::MODE_READ_AND_WRITE;
 
- /** @var Closure(non-empty-string): non-empty-string */
- private Closure $pathResolver;
+ /**
+ * @var \Closure(non-empty-string): non-empty-string
+ */
+ private \Closure $pathResolver;
  private FilesInterface $files;
 
  /**
@@ -32,7 +33,7 @@ public function __construct(?callable $pathResolver = null, ?FilesInterface $fil
  $this->files = $files ?? new Files();
  $this->pathResolver = $pathResolver === null
  ? static fn (string $path): string => $path
- : Closure::fromCallable($pathResolver);
+ : \Closure::fromCallable($pathResolver);
  }
 
  /**

diff --git a/tests/Unit/Path/SimpleResolverTest.php b/tests/Unit/Path/SimpleResolverTest.php