diff --git a/.editorconfig b/.editorconfig index 51b2944d..1b2f0953 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,7 @@ trim_trailing_whitespace = true [*.php] indent_style = space indent_size = 4 +trim_trailing_whitespace = false [*.rst] indent_style = space diff --git a/Documentation/Examples/TYPO3/Index.rst b/Documentation/Examples/TYPO3/Index.rst index 020c1bf9..e330c170 100644 --- a/Documentation/Examples/TYPO3/Index.rst +++ b/Documentation/Examples/TYPO3/Index.rst @@ -44,7 +44,6 @@ If you would like to deploy a TYPO3 Website a good starting point is to use TYPO ->afterStage('switch', \TYPO3\Surf\Task\Php\WebOpcacheResetExecuteTask::class, $application) // CreatePackageStatesTask is done by post-autoload-dump script and can be removed // https://github.com/TYPO3/TYPO3.CMS.BaseDistribution/blob/9.x/composer.json#L38 - ->removeTask(\TYPO3\Surf\Task\TYPO3\CMS\CreatePackageStatesTask::class, $application) - ->removeTask(\TYPO3\Surf\Task\TYPO3\CMS\CopyConfigurationTask::class, $application); + ->removeTask(\TYPO3\Surf\Task\TYPO3\CMS\CreatePackageStatesTask::class, $application); } ); diff --git a/src/Application/TYPO3/CMS.php b/src/Application/TYPO3/CMS.php index 5601e207..204b1291 100644 --- a/src/Application/TYPO3/CMS.php +++ b/src/Application/TYPO3/CMS.php @@ -13,7 +13,6 @@ use TYPO3\Surf\Domain\Model\Workflow; use TYPO3\Surf\Task\DumpDatabaseTask; use TYPO3\Surf\Task\RsyncFoldersTask; -use TYPO3\Surf\Task\TYPO3\CMS\CopyConfigurationTask; use TYPO3\Surf\Task\TYPO3\CMS\CreatePackageStatesTask; use TYPO3\Surf\Task\TYPO3\CMS\FlushCachesTask; use TYPO3\Surf\Task\TYPO3\CMS\SetUpExtensionsTask; @@ -85,14 +84,7 @@ public function registerTasks(Workflow $workflow, Deployment $deployment) } $workflow ->afterStage('transfer', CreatePackageStatesTask::class, $this) - ->afterStage( - 'update', - [ - SymlinkDataTask::class, - CopyConfigurationTask::class - ], - $this - ) + ->afterStage('update', SymlinkDataTask::class, $this) ->afterStage('switch', FlushCachesTask::class, $this) ->addTask(SetUpExtensionsTask::class, 'migrate', $this); } diff --git a/tests/Unit/Command/DescribeCommandTest.php b/tests/Unit/Command/DescribeCommandTest.php index 4bf76f75..0a6141f0 100644 --- a/tests/Unit/Command/DescribeCommandTest.php +++ b/tests/Unit/Command/DescribeCommandTest.php @@ -233,7 +233,6 @@ public function describeTypo3Cms() update: after: TYPO3\Surf\Task\TYPO3\CMS\SymlinkDataTask (for application TYPO3 CMS) - TYPO3\Surf\Task\TYPO3\CMS\CopyConfigurationTask (for application TYPO3 CMS) migrate: tasks: TYPO3\Surf\Task\TYPO3\CMS\SetUpExtensionsTask (for application TYPO3 CMS)