TASK: Upgrade neos/utility-files

TYPO3 · Feb 23, 2023 · b317ab9 · b317ab9
1 parent dad4d15
commit b317ab9
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
         "monolog/monolog": "^2.9.1",
         "myclabs/php-enum": "^1.8",
-        "neos/utility-files": "^3.0",
+        "neos/utility-files": "^7.3.10",
         "padraic/phar-updater": "1.0.6",
         "symfony/config": "^5.0",
         "symfony/console": "^5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -10,34 +10,27 @@
  */
 
 use Rector\Config\RectorConfig;
-use Rector\Core\Configuration\Option;
 use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->parallel();
     $rectorConfig->importNames();
 
     // get parameters
-    $parameters = $rectorConfig->parameters();
-    $parameters->set(Option::PATHS, [
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
     ]);
-    $parameters->set(Option::SKIP, [
-        AddLiteralSeparatorToNumberRector::class
-    ]);
-    $rectorConfig->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY);
-    $rectorConfig->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
-    $rectorConfig->import(PHPUnitSetList::PHPUNIT_EXCEPTION);
-    $rectorConfig->import(PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER);
-    $rectorConfig->import(LevelSetList::UP_TO_PHP_74);
-
-    // get services (needed for register a single rule)
-    $services = $rectorConfig->services();
+    $rectorConfig->skip([
+        AddLiteralSeparatorToNumberRector::class,
 
-    // register a single rule
-    //$services->set(TypedPropertyRector::class);
-    //$services->set(AddVoidReturnTypeWhereNoReturnRector::class);
+    ]);
+    $rectorConfig->sets([
+        PHPUnitSetList::PHPUNIT_CODE_QUALITY,
+        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+        PHPUnitSetList::PHPUNIT_EXCEPTION,
+        PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER,
+        LevelSetList::UP_TO_PHP_74,
+    ]);
 };
diff --git a/src/Domain/Model/Deployment.php b/src/Domain/Model/Deployment.php
@@ -11,11 +11,11 @@
 
 namespace TYPO3\Surf\Domain\Model;
 
+use Neos\Utility\Files;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Enum\DeploymentStatus;
 use TYPO3\Surf\Exception as SurfException;
 use UnexpectedValueException;

diff --git a/src/Domain/Service/ShellCommandService.php b/src/Domain/Service/ShellCommandService.php
@@ -12,11 +12,11 @@
 namespace TYPO3\Surf\Domain\Service;
 
 use Monolog\Logger;
+use Neos\Utility\Files;
 use Phar;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Process\Process;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;
 use TYPO3\Surf\Exception\TaskExecutionException;

diff --git a/src/Integration/Factory.php b/src/Integration/Factory.php
@@ -13,11 +13,11 @@
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
+use Neos\Utility\Files;
 use RuntimeException;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Filesystem\FilesystemInterface;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\FailedDeployment;

diff --git a/src/Task/Composer/AbstractComposerTask.php b/src/Task/Composer/AbstractComposerTask.php
@@ -11,9 +11,9 @@
 
 namespace TYPO3\Surf\Task\Composer;
 
+use Neos\Utility\Files;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;

diff --git a/src/Task/GitCheckoutTask.php b/src/Task/GitCheckoutTask.php
@@ -11,8 +11,8 @@
 
 namespace TYPO3\Surf\Task;
 
+use Neos\Utility\Files;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;

diff --git a/src/Task/Laravel/AbstractCliTask.php b/src/Task/Laravel/AbstractCliTask.php
@@ -17,6 +17,7 @@
 use TYPO3\Surf\Domain\Model\Task;
 use TYPO3\Surf\Domain\Service\ShellCommandServiceAwareInterface;
 use TYPO3\Surf\Domain\Service\ShellCommandServiceAwareTrait;
+use TYPO3\Surf\Exception\TaskExecutionException;
 
 abstract class AbstractCliTask extends Task implements ShellCommandServiceAwareInterface
 {
@@ -41,7 +42,7 @@ abstract class AbstractCliTask extends Task implements ShellCommandServiceAwareI
      * @param Deployment $deployment
      * @param array $options
      * @return bool|mixed
-     * @throws \TYPO3\Surf\Exception\TaskExecutionException
+     * @throws TaskExecutionException
      */
     protected function executeCliCommand(
         array $cliArguments,

diff --git a/src/Task/Neos/Flow/CopyConfigurationTask.php b/src/Task/Neos/Flow/CopyConfigurationTask.php
@@ -11,8 +11,8 @@
 
 namespace TYPO3\Surf\Task\Neos\Flow;
 
+use Neos\Utility\Files;
 use Phar;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;

diff --git a/src/Task/Php/WebOpcacheResetCreateScriptTask.php b/src/Task/Php/WebOpcacheResetCreateScriptTask.php
@@ -11,8 +11,8 @@
 
 namespace TYPO3\Surf\Task\Php;
 
+use Neos\Utility\Files;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Filesystem\FilesystemInterface;
 use TYPO3\Surf\Domain\Generator\RandomBytesGeneratorInterface;
 use TYPO3\Surf\Domain\Model\Application;

diff --git a/src/Task/TYPO3/CMS/SymlinkDataTask.php b/src/Task/TYPO3/CMS/SymlinkDataTask.php
@@ -11,9 +11,9 @@
 
 namespace TYPO3\Surf\Task\TYPO3\CMS;
 
+use Neos\Utility\Files;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;

diff --git a/src/Task/Transfer/RsyncTask.php b/src/Task/Transfer/RsyncTask.php
@@ -11,10 +11,10 @@
 
 namespace TYPO3\Surf\Task\Transfer;
 
+use Neos\Utility\Files;
 use Phar;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;

diff --git a/src/Task/Transfer/ScpTask.php b/src/Task/Transfer/ScpTask.php
@@ -11,7 +11,7 @@
 
 namespace TYPO3\Surf\Task\Transfer;
 
-use TYPO3\Flow\Utility\Files;
+use Neos\Utility\Files;
 use TYPO3\Surf\Domain\Enum\SimpleWorkflowStage;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;

diff --git a/tests/Unit/Task/Php/WebOpcacheResetCreateScriptTaskTest.php b/tests/Unit/Task/Php/WebOpcacheResetCreateScriptTaskTest.php
@@ -11,8 +11,8 @@
 
 namespace TYPO3\Surf\Tests\Unit\Task\Php;
 
+use Neos\Utility\Files;
 use PHPUnit\Framework\MockObject\MockObject;
-use TYPO3\Flow\Utility\Files;
 use TYPO3\Surf\Domain\Filesystem\FilesystemInterface;
 use TYPO3\Surf\Domain\Generator\RandomBytesGeneratorInterface;
 use TYPO3\Surf\Exception\TaskExecutionException;