DevKit updates for 4.x branch (#1649)

* DevKit updates * DevKit updates * Add phpcsfixer Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
sonata-project · Mar 28, 2022 · bad0718 · bad0718
1 parent d23f2d9
commit bad0718
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -21,7 +21,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Set up Python 3.7
               uses: actions/setup-python@v2
@@ -32,10 +32,9 @@ jobs:
               run: python -c "import sys; print(sys.version)"
 
             - name: Cache pip
-              uses: actions/cache@v2
+              uses: actions/cache@v3
               with:
                   path: ~/.cache/pip
-
                   key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
                   restore-keys: ${{ runner.os }}-pip-
 
@@ -52,7 +51,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Run DOCtor-RST
               uses: docker://oskarstark/doctor-rst

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -21,16 +21,21 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
                   php-version: '8.1'
                   coverage: none
-                  tools: composer:v2, php-cs-fixer:3
-              env:
-                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  tools: composer:v2
+                  extensions: zip
+
+            - name: Install Composer dependencies (highest)
+              uses: ramsey/composer-install@v2
+              with:
+                  dependency-versions: highest
+                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint PHP files
               run: make lint-php
@@ -42,7 +47,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -63,15 +68,10 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Ruby 2.6
-              uses: actions/setup-ruby@v1
-              with:
-                  ruby-version: '2.6'
+              uses: actions/checkout@v3
 
-            - name: Install required gem
-              run: gem install yaml-lint
+            - name: Install yamllint
+              run: sudo apt-get install yamllint
 
             - name: Lint files
               run: make lint-yaml
@@ -83,7 +83,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install required dependencies
               run: sudo apt-get update && sudo apt-get install libxml2-utils

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -21,7 +21,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -46,7 +46,7 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -10,18 +10,20 @@ on:
     schedule:
         - cron: 0 9-18 * * *
 
+permissions:
+    issues: write
+    pull-requests: write
+
 jobs:
     stale:
         runs-on: ubuntu-latest
 
         steps:
             - name: Close stale issues and pull requests
-              uses: actions/stale@v1.1.0
+              uses: actions/stale@v5
               with:
-                  days-before-close: 7
                   days-before-stale: 180
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  exempt-issue-label: keep
+                  exempt-issue-labels: keep
                   stale-issue-label: stale
                   stale-issue-message: >
                       This issue has been automatically marked as stale because it has not had

diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
@@ -21,7 +21,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -31,7 +31,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
                   composer-options: --prefer-dist --prefer-stable
@@ -46,7 +46,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
                   composer-options: --prefer-dist --prefer-stable
@@ -71,7 +71,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -81,7 +81,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
                   composer-options: --prefer-dist --prefer-stable
@@ -96,7 +96,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
@@ -106,7 +106,7 @@ jobs:
                   tools: composer:v2
 
             - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
                   composer-options: --prefer-dist --prefer-stable

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -62,7 +62,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ lint-xliff:
 .PHONY: lint-xliff
 
 lint-php:
-	php-cs-fixer fix --ansi --verbose --diff --dry-run
+	vendor/bin/php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php
 
 lint-symfony: lint-symfony-container lint-symfony-twig lint-symfony-xliff lint-symfony-yaml
@@ -70,7 +70,7 @@ cs-fix: cs-fix-php cs-fix-xml cs-fix-xliff cs-fix-composer
 .PHONY: cs-fix
 
 cs-fix-php:
-	php-cs-fixer fix --verbose
+	vendor/bin/php-cs-fixer fix --verbose
 .PHONY: cs-fix-php
 
 cs-fix-xml:

diff --git a/composer.json b/composer.json
@@ -48,6 +48,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.4",
+        "friendsofphp/php-cs-fixer": "^3.4",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",