Update php to 8 (#32)

* update php to 8 and fix

* replace file system helper with external lib

Author: marvin255

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['7.3', '7.4', '8.0']
 
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('**/composer.json') }}
         restore-keys: |
           ${{ runner.os }}-php-
 

.gitignore

@@ -7,5 +7,7 @@ composer.lock
 tests/coverage
 docker/.env
 test.php
+generator/extracted
+generator/archive
 
 .~lock.*

Makefile

@@ -33,5 +33,5 @@ coverage: ## Run tests with coverage
 xsd: ## Build entities from yaml file with description
 	$(php_container_bin) composer run-script xsd
 
-entites: ## Build entities from yaml file with description
-	$(php_container_bin) composer run-script entites
+entities: ## Build entities from yaml file with description
+	$(php_container_bin) composer run-script entities

composer.json

@@ -5,7 +5,7 @@
     "keywords": ["php", "fias"],
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.3",
         "ext-soap": "*",
         "ext-libxml": "*",
         "ext-xmlreader": "*",
@@ -17,11 +17,12 @@
         "symfony/property-info": "^4.0|^5.0",
         "psr/log": "^1.1",
         "ramsey/uuid": "^3.0|^4.0",
-        "symfony/process": "^4.0|^5.0"
+        "symfony/process": "^4.0|^5.0",
+        "marvin255/file-system-helper": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0|^8.0|^9.0",
-        "fzaninotto/faker": "^1.7",
+        "fakerphp/faker": "^1.7",
         "friendsofphp/php-cs-fixer": "^2.16",
         "sebastian/phpcpd": "^4.0|^5.0|^6.0",
         "vimeo/psalm": "^4.0"
@@ -43,8 +44,8 @@
         "coverage": "vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-html=tests/coverage",
         "fixer": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v",
         "linter": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation && vendor/bin/phpcpd ./ --exclude vendor --exclude resources --exclude tests && vendor/bin/psalm --show-info=true",
-        "xsd": "php -f generator/download_entites.php",
-        "entites": "php -f generator/generate_entities.php && vendor/bin/php-cs-fixer fix --config=.php_cs.dist -q"
+        "xsd": "php -f generator/download_entities.php",
+        "entities": "php -f generator/generate_entities.php && vendor/bin/php-cs-fixer fix --config=.php_cs.dist -q"
     },
     "repositories": [
         {

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-cli-alpine
+FROM php:8-cli-alpine
 
 
 RUN set -xe && apk update && apk add --no-cache \
@@ -24,7 +24,7 @@ RUN docker-php-ext-install zip soap \
     && echo 'xdebug.mode=coverage' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer  --version=2.0.1 \
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer  --version=2.0.11 \
     && mkdir -p /.composer && chmod -Rf 777 /.composer
 
 

generator/download_entites.php renamed to generator/download_entities.php

@@ -2,12 +2,13 @@
 
 use Liquetsoft\Fias\Component\Downloader\CurlDownloader;
 use Liquetsoft\Fias\Component\FiasInformer\SoapFiasInformer;
-use Liquetsoft\Fias\Component\Helper\FileSystemHelper;
 use Liquetsoft\Fias\Component\Helper\PathHelper;
 use Liquetsoft\Fias\Component\Unpacker\ZipUnpacker;
+use Marvin255\FileSystemHelper\FileSystemFactory;
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
+$fs = FileSystemFactory::create();
 $informer = new SoapFiasInformer();
 $downloader = new CurlDownloader();
 $unpack = new ZipUnpacker();
@@ -16,11 +17,9 @@
 $tmpDir = new SplFileInfo("{$sysTmp}/extracted");
 $xsdFolder = new SplFileInfo(PathHelper::resource('xsd'));
 
-FileSystemHelper::remove($tmpFile);
-FileSystemHelper::remove($tmpDir);
-if (!mkdir($tmpDir->getPathname(), 0777, true)) {
-    throw new RuntimeException("Can't create temp dir.");
-}
+$fs->removeIfExists($tmpFile);
+$fs->mkdirIfNotExist($tmpDir);
+$fs->emptyDir($tmpDir);
 
 $deltas = $informer->getDeltaList();
 $version = reset($deltas);
@@ -31,7 +30,7 @@
 $downloader->download($version->getUrl(), $tmpFile);
 $unpack->unpack($tmpFile, $tmpDir);
 
-FileSystemHelper::remove($xsdFolder);
-FileSystemHelper::move(new SplFileInfo($tmpDir->getPathname() . '/Schemas'), $xsdFolder);
-FileSystemHelper::remove($tmpDir);
-FileSystemHelper::remove($tmpFile);
+$fs->removeIfExists($xsdFolder);
+$fs->rename($tmpDir->getPathname() . '/Schemas', $xsdFolder);
+$fs->removeIfExists($tmpDir);
+$fs->removeIfExists($tmpFile);

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
+<phpunit bootstrap="vendor/autoload.php"
     colors="true"
     beStrictAboutTestsThatDoNotTestAnything="true">
 

src/Downloader/CurlDownloader.php

@@ -60,7 +60,7 @@ public function download(string $url, SplFileInfo $localFile): void
     protected function curlDownload(array $requestOptions): array
     {
         $ch = curl_init();
-        if (!is_resource($ch)) {
+        if ($ch === false) {
             throw new DownloaderException("Can't init curl resource.");
         }
 

src/Helper/FileSystemHelper.php

@@ -4,8 +4,9 @@
 
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
-use Liquetsoft\Fias\Component\Helper\FileSystemHelper;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Marvin255\FileSystemHelper\FileSystemFactory;
+use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
 use SplFileInfo;
 
@@ -16,6 +17,16 @@ class CleanupTask implements Task, LoggableTask
 {
     use LoggableTaskTrait;
 
+    /**
+     * @var FileSystemHelperInterface
+     */
+    private $fs;
+
+    public function __construct()
+    {
+        $this->fs = FileSystemFactory::create();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -31,7 +42,7 @@ public function run(State $state): void
         foreach ($toRemove as $fileInfo) {
             if ($fileInfo instanceof SplFileInfo) {
                 $this->log(LogLevel::INFO, "Cleaning up '{$fileInfo->getRealPath()}' folder.");
-                FileSystemHelper::remove($fileInfo);
+                $this->fs->removeIfExists($fileInfo);
             }
         }
     }

src/Pipeline/Task/CleanupTask.php

@@ -5,9 +5,9 @@
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
 use InvalidArgumentException;
-use Liquetsoft\Fias\Component\Exception\TaskException;
-use Liquetsoft\Fias\Component\Helper\FileSystemHelper;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Marvin255\FileSystemHelper\FileSystemFactory;
+use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
 use SplFileInfo;
 
@@ -24,6 +24,11 @@ class PrepareFolderTask implements Task, LoggableTask
      */
     protected $folder;
 
+    /**
+     * @var FileSystemHelperInterface
+     */
+    private $fs;
+
     /**
      * @param string $folder
      *
@@ -41,29 +46,23 @@ public function __construct(string $folder)
         }
 
         $this->folder = new SplFileInfo($trimmedFolder);
+        $this->fs = FileSystemFactory::create();
     }
 
     /**
      * {@inheritDoc}
      */
     public function run(State $state): void
     {
-        if ($this->folder->isDir()) {
-            $this->log(LogLevel::INFO, "Emptying '{$this->folder->getRealPath()}' folder.");
-            FileSystemHelper::remove($this->folder);
-        }
-
-        if (!mkdir($this->folder->getPathname())) {
-            throw new TaskException("Can't create '" . $this->folder->getPathname() . "' folder.");
-        }
+        $this->log(LogLevel::INFO, "Emptying '{$this->folder->getRealPath()}' folder.");
+        $this->fs->mkdirIfNotExist($this->folder);
+        $this->fs->emptyDir($this->folder);
 
         $downloadToFile = new SplFileInfo($this->folder->getRealPath() . '/archive');
         $extractToFolder = new SplFileInfo($this->folder->getRealPath() . '/extracted');
 
         $this->log(LogLevel::INFO, "Creating '{$this->folder->getRealPath()}/extracted' folder.");
-        if (!mkdir($extractToFolder->getPathname())) {
-            throw new TaskException("Can't create '" . $extractToFolder->getPathname() . "' folder.");
-        }
+        $this->fs->mkdir($extractToFolder);
 
         $state->setAndLockParameter(Task::DOWNLOAD_TO_FILE_PARAM, $downloadToFile);
         $state->setAndLockParameter(Task::EXTRACT_TO_FOLDER_PARAM, $extractToFolder);

src/Pipeline/Task/PrepareFolderTask.php

@@ -4,8 +4,9 @@
 
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
-use Liquetsoft\Fias\Component\Helper\FileSystemHelper;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Marvin255\FileSystemHelper\FileSystemFactory;
+use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
 use SplFileInfo;
 
@@ -22,6 +23,11 @@ class SaveFiasFilesTask implements Task, LoggableTask
      */
     protected $movePaths;
 
+    /**
+     * @var FileSystemHelperInterface
+     */
+    private $fs;
+
     /**
      * @param string|null $moveArchiveTo
      * @param string|null $moveExtractedTo
@@ -37,6 +43,8 @@ public function __construct(?string $moveArchiveTo, ?string $moveExtractedTo)
         if ($moveExtractedTo !== null) {
             $this->movePaths[Task::EXTRACT_TO_FOLDER_PARAM] = $moveExtractedTo;
         }
+
+        $this->fs = FileSystemFactory::create();
     }
 
     /**
@@ -54,7 +62,7 @@ public function run(State $state): void
             $message = sprintf("Moving '%s' to '%s'.", $fileInfo->getRealPath(), $movePath);
             $this->log(LogLevel::INFO, $message);
 
-            FileSystemHelper::move($fileInfo, new SplFileInfo($movePath));
+            $this->fs->rename($fileInfo, $movePath);
         }
     }
 }