Merge pull request #55 from rulatir/master

Flysystem v3 port

Author: jaapio

Makefile

@@ -21,11 +21,11 @@ phpstan:
 
 .PHONY: psaml
 psalm:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.4 tools/psalm
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2 tools/psalm
 
 .PHONY: test
 test:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/phpunit
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2 tools/phpunit
 
 .PHONY: pre-commit-test
 pre-commit-test: test phpcs phpstan psalm

README.md

@@ -8,7 +8,7 @@
 FlyFinder
 =========
 
-FlyFinder is a plugin for [Flysystem](http://flysystem.thephpleague.com/) that will enable you to find files
+FlyFinder is a utility class for [Flysystem](http://flysystem.thephpleague.com/) that will enable you to find files
 based on certain criteria.
 
 FlyFinder can search for files that are hidden (either because they are hidden files themselves, or because they are
@@ -33,14 +33,14 @@ In order to use the FlyFinder plugin you first need a Flyfinder filesystem with
 for instance the local adapter.
 
     use League\Flysystem\Filesystem;
-    use League\Flysystem\Adapter;
+    use League\Flysystem\Local\LocalFilesystemAdapter as LocalAdapter;
     use Flyfinder\Finder;
 
-    $filesystem = new Filesystem(new Adapter\Local(__DIR__.'/path/to/files/'));
+    $filesystem = new Filesystem(new LocalAdapter(__DIR__.'/path/to/files/'));
 
-Now you can add the plugin as follows:
+Now you can create the `Finder` instance:
 
-    $filesystem->addPlugin(new Finder());
+    $finder = new Finder($filesystem); 
 
 FlyFinder will need specifications to know what to look for. The following specifications are available:
 
@@ -74,6 +74,6 @@ extension.
 
 You can also make longer chains like this:
 
-` $specification = $inPath->andSpecification($hasExtension)->andSpecification($isHidden->notSpecification());`
+`$specification = $inPath->andSpecification($hasExtension)->andSpecification($isHidden->notSpecification());`
 
 This will find all files in the given path, that have the given extension and are not hidden.

composer.json

@@ -18,13 +18,13 @@
     }
   },
   "require": {
-    "php":              "^7.2||^8.0",
-    "league/flysystem": "^1.0"
+    "php":              "^8.0||^8.1||8.2",
+    "league/flysystem": "^3.0"
   },
   "minimum-stability":  "stable",
   "require-dev": {
     "mockery/mockery":  "^1.3",
-    "league/flysystem-memory": "~1"
+    "league/flysystem-memory": "~3"
   },
   "extra": {
     "branch-alias": {

composer.lock

@@ -2,7 +2,7 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 use League\Flysystem\Filesystem;
-use League\Flysystem\Memory\MemoryAdapter as Adapter;
+use League\Flysystem\InMemory\InMemoryFilesystemAdapter as Adapter;
 use Flyfinder\Finder;
 use Flyfinder\Specification\IsHidden;
 
@@ -11,7 +11,8 @@
  * In this example we are using a filesystem with the memory adapter
  */
 $filesystem = new Filesystem(new Adapter());
-$filesystem->addPlugin(new Finder());
+$finder = new Finder();
+$finder->setFilesystem($filesystem);
 
 // Create some demo files
 $filesystem->write('test.txt', 'test');
@@ -22,7 +23,7 @@
 $specification = new IsHidden();
 
 //FlyFinder will yield a generator object with the files that are found
-$generator = $filesystem->find($specification);
+$generator = $finder->find($specification);
 
 $result = [];
 

examples/01-find-hidden-files.php

@@ -2,19 +2,20 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 use League\Flysystem\Filesystem;
-use League\Flysystem\Memory\MemoryAdapter as Adapter;
+use League\Flysystem\InMemory\InMemoryFilesystemAdapter as Adapter;
 use Flyfinder\Finder;
 use Flyfinder\Path;
 use Flyfinder\Specification\IsHidden;
 use Flyfinder\Specification\HasExtension;
-use Flyfinder\Specification\InPath;
+use Flyfinder\Specification\InPath;use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
 
 /*
  * First create a new Filesystem and add the FlySystem plugin
  * In this example we are using a filesystem with the memory adapter
  */
 $filesystem = new Filesystem(new Adapter());
-$filesystem->addPlugin(new Finder());
+$finder = new Finder();
+$finder->setFilesystem($filesystem);
 
 // Create some demo files
 $filesystem->write('test.txt', 'test');
@@ -33,7 +34,7 @@
 $specification = $inPath->andSpecification($hasExtension)->andSpecification($isHidden->notSpecification());
 
 //FlyFinder will yield a generator object with the files that are found
-$generator = $filesystem->find($specification);
+$generator = $finder->find($specification);
 
 $result = [];
 

examples/02-find-on-multiple-criteria.php

@@ -2,7 +2,7 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 use League\Flysystem\Filesystem;
-use League\Flysystem\Adapter\Local;
+use League\Flysystem\Local\LocalFilesystemAdapter as Local;
 use Flyfinder\Finder;
 use Flyfinder\Path;
 use Flyfinder\Specification\IsHidden;
@@ -12,7 +12,8 @@
 
 // (03-sample-files based on some phpDocumentor2 src files)
 $filesystem = new Filesystem(new Local(__DIR__ . '/03-sample-files'));
-$filesystem->addPlugin(new Finder());
+$finder = new Finder();
+$finder->setFilesystem($filesystem);
 
 /*
  * "phpdoc -d src -i src/phpDocumentor/DomainModel"
@@ -27,7 +28,7 @@
 $spec->andSpecification($isHidden->notSpecification());
 $spec->andSpecification($isPhpFile);
 
-$generator = $filesystem->find($spec);
+$generator = $finder->find($spec);
 $result = [];
 foreach($generator as $value) {
     $result[] = $value;