Merge branch 'master' into issue-396-force-option-in-flushcachestask

TYPO3 · Jun 26, 2020 · 334c37d · 334c37d
2 parents ca0f280 + eff2cbb
commit 334c37d
Show file tree

Hide file tree

Showing 11 changed files with 669 additions and 208 deletions.
diff --git a/.github/workflows/php_cs_fixer.yaml b/.github/workflows/php_cs_fixer.yaml
@@ -4,33 +4,43 @@ on:
     pull_request:
         branches:
             - master
+            - 2.0
 
 jobs:
     php-cs-fixer:
         runs-on: ubuntu-latest
+        # dont run jobs on forks, because we are not allowed to commit
+        if: github.event.pull_request.draft == false && github.repository == 'TYPO3/Surf'
+
         steps:
-            -   uses: actions/checkout@v2.0.0
-            -   id: composer-cache
+            -   uses: actions/checkout@v2
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   name: Get Composer Cache Directory
+                id: composer-cache
                 run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-            -   uses: actions/cache@v1
+
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 7.2
+                    coverage: none # disable xdebug, pcov
+
+            -   name: Cache Composer Dependencies
+                uses: actions/cache@v1
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: |
-                        ${{ runner.os }}-composer-
-            -   uses: shivammathur/setup-php@v1
-                with:
-                    php-version: 7.2
-                    coverage: none
+                    restore-keys: ${{ runner.os }}-composer-
 
-            -   run: composer install --no-progress
+            -   name: Install Composer Dependencies
+                run: composer install --no-progress
 
             -   name: Run php-cs-fixer
-                run: ./vendor/bin/php-cs-fixer fix --config=./.php_cs
+                run: vendor/bin/php-cs-fixer fix --config=./.php_cs --diff
 
-            -   uses: stefanzweifel/git-auto-commit-action@v2.5.0
+            -   name: Commit changed files
+                uses: stefanzweifel/git-auto-commit-action@v4
                 with:
                     commit_message: Apply php-cs-fixer changes
-                    branch: "master"
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                    branch: ${{ github.head_ref }}
diff --git a/Documentation/DeploymentFlow/Index.rst b/Documentation/DeploymentFlow/Index.rst
@@ -81,11 +81,11 @@ If you like to add your own tasks to a specific stage of the flow, you can just
     // Add tasks that shall be executed before the given stage
     $workflow->beforeStage('YourTask', 'cleanup');
 
-   // Add tasks that shall be executed before the given task
-   $workflow->beforeTask(AnotherTask::class, 'YourTask');
+    // Add tasks that shall be executed before the given task
+    $workflow->beforeTask(AnotherTask::class, 'YourTask');
 
-   // Add tasks that shall be executed after the given task
-   $workflow->afterTask(AnotherTask::class, 'YourTask');
+    // Add tasks that shall be executed after the given task
+    $workflow->afterTask(AnotherTask::class, 'YourTask');
 
 If you like to remove certain tasks from the flow, just do it like that::
 
@@ -94,4 +94,3 @@ If you like to remove certain tasks from the flow, just do it like that::
 
    // Only remove the task for a specific application
    $workflow->removeTask(FlushCachesTask::class, $application);
-