Upgrade dependencies.

Prepared code for PHP8.

Author: briedis

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 .idea
-composer.lock
+composer.lock
+.phpunit.result.cache

composer.json

@@ -7,11 +7,10 @@
         "ext-json": "*",
         "ext-zip": "*",
         "ext-gettext": "*",
-        "gettext/gettext": "^4.7.0",
-        "league/flysystem": "^1.0"
+        "gettext/gettext": "^4.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4",
+        "phpunit/phpunit": "^9.0",
         "mockery/mockery": "^1.1",
         "mikey179/vfsstream": "^1.6"
     },

phpunit.xml

@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
->
-    <filter>
-        <whitelist>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
+         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
-
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Printful GettextCms Test Suite">
             <directory suffix=".php">./tests/</directory>
             <exclude>./tests/assets</exclude>
             <exclude>./tests/Stubs</exclude>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

src/MessageExtractor.php

@@ -2,20 +2,20 @@
 
 namespace Printful\GettextCms;
 
+use FilesystemIterator;
 use Gettext\Extractors\ExtractorInterface;
 use Gettext\Extractors\ExtractorMultiInterface;
 use Gettext\Extractors\JsCode;
 use Gettext\Extractors\PhpCode;
 use Gettext\Extractors\VueJs;
 use Gettext\Translations;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
-use League\Flysystem\Plugin\ListFiles;
 use Printful\GettextCms\Exceptions\GettextCmsException;
 use Printful\GettextCms\Exceptions\InvalidPathException;
 use Printful\GettextCms\Exceptions\UnknownExtractorException;
 use Printful\GettextCms\Interfaces\MessageConfigInterface;
 use Printful\GettextCms\Structures\ScanItem;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 /**
  * Class extracts gettext function calls from source files and converts them to Translation objects
@@ -55,7 +55,7 @@ public function extract(array $items, array $domains = null): array
         }
 
         /** @var Translations[] $allTranslations [domain => translations, ...] */
-        $allTranslations = array_reduce($domains, function (&$carry, string $domain) use ($defaultDomain) {
+        $allTranslations = array_reduce($domains, function ($carry, string $domain) use ($defaultDomain) {
             $translations = new Translations();
 
             // When we scan for default domain, we have to specify an empty value
@@ -160,23 +160,32 @@ private function resolveDirectoryFiles(ScanItem $item): array
     {
         $dir = realpath($item->path);
 
-        $adapter = new Local($dir);
-        $filesystem = new Filesystem($adapter);
-        $filesystem->addPlugin(new ListFiles());
-
-        $files = $filesystem->listFiles('', $item->recursive);
+        if ($item->recursive) {
+            $iterator = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS)
+            );
+        } else {
+            $iterator = new FilesystemIterator($dir, FilesystemIterator::SKIP_DOTS);
+        }
 
         // If no extensions are given, fallback to known extensions
         $extensions = $item->extensions ?: array_keys(self::EXTRACTORS);
 
-        // If extensions are set, filter other files out
-        $files = array_filter($files, function ($file) use ($item, $extensions) {
-            return isset($file['extension']) && in_array($file['extension'], $extensions);
-        });
+        $matchingPathnames = [];
+
+        foreach ($iterator as $file) {
+            if ($file->isDir()) {
+                continue;
+            }
+
+            $extension = strtolower($file->getExtension());
+
+            if ($extensions && in_array($extension, $extensions)) {
+                $matchingPathnames[] = $file->getRealPath();
+            }
+        }
 
-        return array_map(function ($file) use ($dir) {
-            return $dir . DIRECTORY_SEPARATOR . $file['path'];
-        }, $files);
+        return $matchingPathnames;
     }
 
     /**

tests/TestCase.php

@@ -2,9 +2,10 @@
 
 namespace Printful\GettextCms\Tests;
 
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
+use FilesystemIterator;
 use Mockery;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
@@ -15,22 +16,29 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
      */
     protected function deleteDirectory($path)
     {
-        $path = rtrim($path, '/');
+        if (!is_dir($path)) {
+            return;
+        }
 
-        $childDirName = pathinfo($path, PATHINFO_BASENAME);
-        $parentDir = dirname($path);
+        $iterator = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS);
+        $files = new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($files as $file) {
+            if ($file->isDir()) {
+                rmdir($file->getRealPath());
+            } else {
+                unlink($file->getRealPath());
+            }
+        }
 
-        $adapter = new Local($parentDir);
-        $filesystem = new Filesystem($adapter);
-        $filesystem->deleteDir($childDirName);
+        rmdir($path);
     }
 
     protected function getDummyFile(string $filename = 'dummy-file.php', string $directory = 'dummy-directory'): string
     {
         return __DIR__ . '/assets/' . $directory . '/' . $filename;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();

tests/TestCases/BuilderTest.php

@@ -45,7 +45,7 @@ class BuilderTest extends TestCase
     /** @var string */
     private $domain;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -158,7 +158,7 @@ public function testDefaultLocaleIsNotExported()
         $this->config->shouldReceive('getDefaultLocale')->andReturn('en_EN')->byDefault();
         $this->config->shouldReceive('getMoDirectory')->andReturn('whatever')->never();
 
-        // If there were an attempt to export, error would happend because mo directory does not exist
+        // If there were an attempt to export, error would happen because mo directory does not exist
         self::assertTrue($this->exporter->export('en_EN', 'domain'), 'Default domain is not exported');
     }
 
@@ -180,7 +180,7 @@ private function verifyTranslations(array $messages, string $locale, string $dom
         }
     }
 
-    private function getMoPathname($domain)
+    private function getMoPathname($domain): string
     {
         return $this->locale . '/LC_MESSAGES/' . $domain . '.mo';
     }

tests/TestCases/DynamicImporterTest.php

@@ -23,7 +23,7 @@ class DynamicImporterTest extends TestCase
     /** @var DynamicMessageImporter */
     private $importer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCases/FileResolvingTest.php

@@ -15,7 +15,7 @@ class FileResolvingTest extends TestCase
     /** @var MessageExtractor */
     private $scanner;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCases/ImporterTest.php

@@ -27,7 +27,7 @@ class ImporterTest extends TestCase
     /** @var MessageExtractor */
     private $extractor;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCases/JsBuilderTest.php

@@ -18,7 +18,7 @@ class JsBuilderTest extends TestCase
     /** @var MessageJsBuilder */
     private $builder;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -39,17 +39,17 @@ public function testExportJsonp()
 
         $js = $this->builder->exportJsonp($this->locale, $domains, 'loaded');
 
-        self::assertNotContains('non-js', $js, 'Non-js translation is not included');
+        self::assertStringNotContainsString('non-js', $js, 'Non-js translation is not included');
 
         foreach ($domains as $domain) {
             $ts = $this->storage->getEnabledTranslatedJs($this->locale, $domain);
 
-            self::assertTrue(count($ts) > 0, 'Domain ' . $domain . ' has translations');
+            self::assertNotEmpty($ts, 'Domain ' . $domain . ' has translations');
 
             foreach ($ts as $t) {
                 /** @var Translation $t */
-                self::assertContains($t->getOriginal(), $js, $t->getOriginal() . ' is within JS');
-                self::assertContains($t->getTranslation(), $js, $t->getTranslation() . ' translation is within JS');
+                self::assertStringContainsString($t->getOriginal(), $js, $t->getOriginal() . ' is within JS');
+                self::assertStringContainsString($t->getTranslation(), $js, $t->getTranslation() . ' translation is within JS');
             }
         }
     }