Исправление ошибки установки (#59)

Co-authored-by: Storozhuk Valentine <vstorozhuk@evilcoders.me>

.gitattributes

@@ -0,0 +1,10 @@
+/.github                    export-ignore
+/docker                     export-ignore
+/generator                  export-ignore
+/tests                      export-ignore
+/.gitattributes             export-ignore
+/.gitignore                 export-ignore
+/.php-cs-fixer.dist.php     export-ignore
+/Makefile                   export-ignore
+/phpunit.xml.dist           export-ignore
+/psalm.xml                  export-ignore

src/Downloader/CurlDownloader.php

@@ -49,7 +49,7 @@ public function download(string $url, \SplFileInfo $localFile): void
         $response = new CurlDownloaderResponse();
         for ($i = 0; $i < $this->maxAttempts; ++$i) {
             $response = $this->runRequest($url, $options);
-            if ($response->isOk() && $response->getError() === null) {
+            if ($response->isOk() && !$response->hasError()) {
                 break;
             }
             // в случае ошибки пробуем скачать файл еще раз,
@@ -69,7 +69,7 @@ public function download(string $url, \SplFileInfo $localFile): void
 
         fclose($options[\CURLOPT_FILE]);
 
-        if ($response->getError() !== null) {
+        if ($response->hasError()) {
             $message = sprintf(
                 "There was an error while downloading '%s': %s.",
                 $url,

src/Downloader/CurlDownloaderResponse.php

@@ -25,7 +25,7 @@ public function __construct(?array $rawCurlResponse = null)
         $this->statusCode = isset($rawCurlResponse[0]) ? (int) $rawCurlResponse[0] : 0;
         $this->isOk = $this->statusCode >= 200 && $this->statusCode < 300;
         $this->headers = isset($rawCurlResponse[1]) ? $this->extractHeadersFromContent($rawCurlResponse[1]) : [];
-        $this->error = isset($rawCurlResponse[2]) ? (string) $rawCurlResponse[2] : null;
+        $this->error = isset($rawCurlResponse[2]) && !empty($rawCurlResponse[2]) ? (string) $rawCurlResponse[2] : null;
     }
 
     public function getStatusCode(): int
@@ -43,6 +43,11 @@ public function getError(): ?string
         return $this->error;
     }
 
+    public function hasError(): bool
+    {
+        return $this->error !== null;
+    }
+
     /**
      * @return array<string, string>
      */

src/Pipeline/State/StateParameter.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Liquetsoft\Fias\Component\Pipeline\State;
+
+class StateParameter
+{
+    public const FILES_TO_PROCEED = 'files_to_proceed';
+    public const FIAS_VERSION = 'fias_version';
+    public const EXTRACT_TO_FOLDER = 'extract_to';
+    public const FIAS_INFO = 'fias_info';
+    public const DOWNLOAD_TO_FILE = 'download_to';
+}

src/Pipeline/Task/CleanupTask.php

@@ -5,6 +5,7 @@
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Marvin255\FileSystemHelper\FileSystemFactory;
 use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
@@ -29,8 +30,8 @@ public function __construct()
     public function run(State $state): void
     {
         $toRemove = [
-            $state->getParameter(Task::DOWNLOAD_TO_FILE_PARAM),
-            $state->getParameter(Task::EXTRACT_TO_FOLDER_PARAM),
+            $state->getParameter(StateParameter::DOWNLOAD_TO_FILE),
+            $state->getParameter(StateParameter::EXTRACT_TO_FOLDER),
         ];
 
         $toRemove = array_diff($toRemove, [null]);

src/Pipeline/Task/DataAbstractTask.php

@@ -10,6 +10,7 @@
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\Exception\XmlException;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Liquetsoft\Fias\Component\Storage\Storage;
 use Liquetsoft\Fias\Component\XmlReader\XmlReader;
 use Psr\Log\LogLevel;
@@ -65,7 +66,7 @@ abstract protected function processItem(object $item): void;
      */
     public function run(State $state): void
     {
-        $allFiles = $state->getParameter(Task::FILES_TO_PROCEED);
+        $allFiles = $state->getParameter(StateParameter::FILES_TO_PROCEED);
         $allFiles = \is_array($allFiles) ? $allFiles : [];
 
         foreach ($allFiles as $file) {

src/Pipeline/Task/DownloadTask.php

@@ -8,6 +8,7 @@
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\FiasInformer\InformerResponse;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Psr\Log\LogLevel;
 
 /**
@@ -33,17 +34,17 @@ public function __construct(Downloader $downloader)
      */
     public function run(State $state): void
     {
-        $info = $state->getParameter(Task::FIAS_INFO_PARAM);
+        $info = $state->getParameter(StateParameter::FIAS_INFO);
         if (!($info instanceof InformerResponse)) {
             throw new TaskException(
-                "State parameter '" . Task::FIAS_INFO_PARAM . "' must be an '" . InformerResponse::class . "' instance for '" . self::class . "'."
+                "State parameter '" . StateParameter::FIAS_INFO . "' must be an '" . InformerResponse::class . "' instance for '" . self::class . "'."
             );
         }
 
-        $localFile = $state->getParameter(Task::DOWNLOAD_TO_FILE_PARAM);
+        $localFile = $state->getParameter(StateParameter::DOWNLOAD_TO_FILE);
         if (!($localFile instanceof \SplFileInfo)) {
             throw new TaskException(
-                "State parameter '" . Task::DOWNLOAD_TO_FILE_PARAM . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
+                "State parameter '" . StateParameter::DOWNLOAD_TO_FILE . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
             );
         }
 

src/Pipeline/Task/InformDeltaTask.php

@@ -7,6 +7,7 @@
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\FiasInformer\FiasInformer;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Psr\Log\LogLevel;
 
 /**
@@ -32,10 +33,10 @@ public function __construct(FiasInformer $informer)
      */
     public function run(State $state): void
     {
-        $version = (int) $state->getParameter(Task::FIAS_VERSION_PARAM);
+        $version = (int) $state->getParameter(StateParameter::FIAS_VERSION);
         if (!$version) {
             throw new TaskException(
-                "State parameter '" . Task::FIAS_VERSION_PARAM . "' is required for '" . self::class . "'."
+                "State parameter '" . StateParameter::FIAS_VERSION . "' is required for '" . self::class . "'."
             );
         }
 
@@ -61,6 +62,6 @@ public function run(State $state): void
             );
         }
 
-        $state->setAndLockParameter(Task::FIAS_INFO_PARAM, $info);
+        $state->setAndLockParameter(StateParameter::FIAS_INFO, $info);
     }
 }

src/Pipeline/Task/InformFullTask.php

@@ -7,6 +7,7 @@
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\FiasInformer\FiasInformer;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Psr\Log\LogLevel;
 
 /**
@@ -48,6 +49,6 @@ public function run(State $state): void
             ]
         );
 
-        $state->setAndLockParameter(Task::FIAS_INFO_PARAM, $info);
+        $state->setAndLockParameter(StateParameter::FIAS_INFO, $info);
     }
 }

src/Pipeline/Task/PrepareFolderTask.php

@@ -5,6 +5,7 @@
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Marvin255\FileSystemHelper\FileSystemFactory;
 use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
@@ -56,7 +57,7 @@ public function run(State $state): void
         $this->log(LogLevel::INFO, "Creating '{$this->folder->getRealPath()}/extracted' folder.");
         $this->fs->mkdir($extractToFolder);
 
-        $state->setAndLockParameter(Task::DOWNLOAD_TO_FILE_PARAM, $downloadToFile);
-        $state->setAndLockParameter(Task::EXTRACT_TO_FOLDER_PARAM, $extractToFolder);
+        $state->setAndLockParameter(StateParameter::DOWNLOAD_TO_FILE, $downloadToFile);
+        $state->setAndLockParameter(StateParameter::EXTRACT_TO_FOLDER, $extractToFolder);
     }
 }

src/Pipeline/Task/ProcessSwitchTask.php

@@ -6,6 +6,7 @@
 
 use Liquetsoft\Fias\Component\FilesDispatcher\FilesDispatcher;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Psr\Log\LogLevel;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
@@ -48,7 +49,7 @@ public function __construct(
      */
     public function run(State $state): void
     {
-        $rawFiles = $state->getParameter(Task::FILES_TO_PROCEED);
+        $rawFiles = $state->getParameter(StateParameter::FILES_TO_PROCEED);
         $files = [];
         if (\is_array($rawFiles)) {
             $files = array_map(

src/Pipeline/Task/SaveFiasFilesTask.php

@@ -5,6 +5,7 @@
 namespace Liquetsoft\Fias\Component\Pipeline\Task;
 
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Marvin255\FileSystemHelper\FileSystemFactory;
 use Marvin255\FileSystemHelper\FileSystemHelperInterface;
 use Psr\Log\LogLevel;
@@ -33,11 +34,11 @@ public function __construct(?string $moveArchiveTo, ?string $moveExtractedTo)
         $this->movePaths = [];
 
         if ($moveArchiveTo !== null) {
-            $this->movePaths[Task::DOWNLOAD_TO_FILE_PARAM] = $moveArchiveTo;
+            $this->movePaths[StateParameter::DOWNLOAD_TO_FILE] = $moveArchiveTo;
         }
 
         if ($moveExtractedTo !== null) {
-            $this->movePaths[Task::EXTRACT_TO_FOLDER_PARAM] = $moveExtractedTo;
+            $this->movePaths[StateParameter::EXTRACT_TO_FOLDER] = $moveExtractedTo;
         }
 
         $this->fs = FileSystemFactory::create();

src/Pipeline/Task/SelectFilesToProceedTask.php

@@ -8,6 +8,7 @@
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\Filter\Filter;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Psr\Log\LogLevel;
 
 class SelectFilesToProceedTask implements LoggableTask, Task
@@ -32,7 +33,7 @@ public function __construct(EntityManager $entityManager, ?Filter $filter = null
      */
     public function run(State $state): void
     {
-        $folderParameter = $state->getParameter(Task::EXTRACT_TO_FOLDER_PARAM);
+        $folderParameter = $state->getParameter(StateParameter::EXTRACT_TO_FOLDER);
         $extractToFolder = $this->checkDirectory($folderParameter);
 
         $this->log(
@@ -41,7 +42,7 @@ public function run(State $state): void
         );
 
         $files = $this->getFilesForProceedFromFolder($extractToFolder);
-        $state->setAndLockParameter(Task::FILES_TO_PROCEED, $files);
+        $state->setAndLockParameter(StateParameter::FILES_TO_PROCEED, $files);
 
         $this->log(
             LogLevel::INFO,
@@ -65,7 +66,7 @@ private function checkDirectory($parameterValue): \SplFileInfo
     {
         if (!($parameterValue instanceof \SplFileInfo)) {
             throw new TaskException(
-                "State parameter '" . Task::EXTRACT_TO_FOLDER_PARAM . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
+                "State parameter '" . StateParameter::EXTRACT_TO_FOLDER . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
             );
         }
 

src/Pipeline/Task/Task.php

@@ -12,16 +12,6 @@
  */
 interface Task
 {
-    public const FIAS_VERSION_PARAM = 'fias_version';
-
-    public const FIAS_INFO_PARAM = 'fias_info';
-
-    public const DOWNLOAD_TO_FILE_PARAM = 'download_to';
-
-    public const EXTRACT_TO_FOLDER_PARAM = 'extract_to';
-
-    public const FILES_TO_PROCEED = 'files_to_proceed';
-
     /**
      * Запускает задачу на исполнение.
      *

src/Pipeline/Task/UnpackTask.php

@@ -6,6 +6,7 @@
 
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Liquetsoft\Fias\Component\Unpacker\Unpacker;
 use Psr\Log\LogLevel;
 
@@ -31,17 +32,17 @@ public function __construct(Unpacker $unpacker)
      */
     public function run(State $state): void
     {
-        $source = $state->getParameter(Task::DOWNLOAD_TO_FILE_PARAM);
+        $source = $state->getParameter(StateParameter::DOWNLOAD_TO_FILE);
         if (!($source instanceof \SplFileInfo)) {
             throw new TaskException(
-                "State parameter '" . Task::DOWNLOAD_TO_FILE_PARAM . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
+                "State parameter '" . StateParameter::DOWNLOAD_TO_FILE . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
             );
         }
 
-        $destination = $state->getParameter(Task::EXTRACT_TO_FOLDER_PARAM);
+        $destination = $state->getParameter(StateParameter::EXTRACT_TO_FOLDER);
         if (!($destination instanceof \SplFileInfo)) {
             throw new TaskException(
-                "State parameter '" . Task::EXTRACT_TO_FOLDER_PARAM . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
+                "State parameter '" . StateParameter::EXTRACT_TO_FOLDER . "' must be an '" . \SplFileInfo::class . "' instance for '" . self::class . "'."
             );
         }
 

src/Pipeline/Task/VersionGetTask.php

@@ -6,6 +6,7 @@
 
 use Liquetsoft\Fias\Component\Exception\TaskException;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Liquetsoft\Fias\Component\VersionManager\VersionManager;
 
 /**
@@ -34,6 +35,6 @@ public function run(State $state): void
             throw new TaskException('There is no version of FIAS installed.');
         }
 
-        $state->setAndLockParameter(Task::FIAS_VERSION_PARAM, $version->getVersion());
+        $state->setAndLockParameter(StateParameter::FIAS_VERSION, $version->getVersion());
     }
 }

src/Pipeline/Task/VersionSetTask.php

@@ -6,6 +6,7 @@
 
 use Liquetsoft\Fias\Component\FiasInformer\InformerResponse;
 use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Liquetsoft\Fias\Component\VersionManager\VersionManager;
 
 /**
@@ -28,7 +29,7 @@ public function __construct(VersionManager $versionManager)
      */
     public function run(State $state): void
     {
-        $version = $state->getParameter(Task::FIAS_INFO_PARAM);
+        $version = $state->getParameter(StateParameter::FIAS_INFO);
 
         if ($version instanceof InformerResponse && $version->hasResult()) {
             $this->versionManager->setCurrentVersion($version);

tests/src/Downloader/CurlDownloaderTest.php

@@ -33,9 +33,9 @@ public function testDownload(): void
             function (array $options) use ($source) {
                 if (
                     !empty($options[\CURLOPT_HEADER])
-                    || $options[\CURLOPT_URL] === $source
-                    && \is_resource($options[\CURLOPT_FILE])
-                    && !empty($options[\CURLOPT_CONNECT_ONLY])
+                    || ($options[\CURLOPT_URL] === $source
+                        && \is_resource($options[\CURLOPT_FILE])
+                        && !empty($options[\CURLOPT_CONNECT_ONLY]))
                 ) {
                     return [200, '', null];
                 }

tests/src/Pipeline/Task/CleanupTaskTest.php

@@ -4,8 +4,8 @@
 
 namespace Liquetsoft\Fias\Component\Tests\Pipeline\Task;
 
+use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
 use Liquetsoft\Fias\Component\Pipeline\Task\CleanupTask;
-use Liquetsoft\Fias\Component\Pipeline\Task\Task;
 use Liquetsoft\Fias\Component\Tests\BaseCase;
 
 /**
@@ -32,8 +32,8 @@ public function testRun(): void
 
         $state = $this->createDefaultStateMock(
             [
-                Task::DOWNLOAD_TO_FILE_PARAM => $downloadTo,
-                Task::EXTRACT_TO_FOLDER_PARAM => $extractTo,
+                StateParameter::DOWNLOAD_TO_FILE => $downloadTo,
+                StateParameter::EXTRACT_TO_FOLDER => $extractTo,
             ]
         );
 
@@ -56,7 +56,7 @@ public function testRunEmptyFiles(): void
 
         $state = $this->createDefaultStateMock(
             [
-                Task::DOWNLOAD_TO_FILE_PARAM => $downloadTo,
+                StateParameter::DOWNLOAD_TO_FILE => $downloadTo,
             ]
         );