Merge pull request #174 from synolia/feature/update-ci

[v2] Update CI

Author: Jibbarth

.github/workflows/analysis.yaml

@@ -19,7 +19,7 @@ jobs:
                 php:
                     - 8.2
                 symfony:
-                    - '6.2.*'
+                    - '6.4.*'
         env:
             APP_ENV: test
         steps:
@@ -38,7 +38,7 @@ jobs:
                 run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
             -
                 name: 'Composer - Set cache'
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: '${{ steps.composer-cache.outputs.dir }}'
                     key: 'php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles(''**/composer.json'') }}'
@@ -58,17 +58,12 @@ jobs:
                 id: end-of-setup
             -
                 name: 'PHPStan - Run'
-                run: 'if [ -f rulesets/phpstan.neon ]; then vendor/bin/phpstan analyse -c rulesets/phpstan.neon src/ ; else echo PHPStan rulesets file does not exist, skipping step ; fi'
-                if: 'always() && steps.end-of-setup.outcome == ''success'''
-            -
-                name: 'PHPSpec - Run'
-                run: 'if [ -f phpspec.yml.dist ]; then vendor/bin/phpspec run ; else echo PHPSpec config file does not exist, skipping step ; fi'
-                if: 'always() && steps.end-of-setup.outcome == ''success'''
-            -
-                name: 'Checks security issues - Run'
-                run: 'symfony security:check'
+                run: 'if [ -f ruleset/phpstan.neon ]; then vendor/bin/phpstan analyse -c ruleset/phpstan.neon src/ ; else echo PHPStan rulesets file does not exist, skipping step ; fi'
                 if: 'always() && steps.end-of-setup.outcome == ''success'''
+            # TODO: launch Grumphp
+
     sonarcloud:
+      if: github.event.repository.fork != true
       runs-on: ubuntu-latest
       continue-on-error: true
       steps:

.github/workflows/sylius.yaml

@@ -20,11 +20,11 @@ jobs:
                 php:
                     - 8.2
                 sylius:
-                    - 1.12.0
+                    - 2.1.0
                 symfony:
-                    - 6.2
+                    - 6.4
                 node:
-                    - 14.x
+                    - 18.x
         env:
             APP_ENV: test
             package-name: payplug/sylius-payplug-plugin
@@ -54,7 +54,7 @@ jobs:
                 run: 'echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
             -
                 name: 'Composer - Set cache'
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 id: cache-composer
                 with:
                     path: '${{ steps.composer-cache.outputs.dir }}'
@@ -73,7 +73,7 @@ jobs:
                 run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'
             -
                 name: 'Yarn - Set Cache'
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: '${{ steps.yarn-cache.outputs.dir }}'
                     key: 'node-${{ matrix.node }}-yarn-${{ hashFiles(''**/package.json **/yarn.lock'') }}'

README.md

@@ -85,6 +85,7 @@ In local environment, the plugin will not work properly because you will not be
    namespace App\Entity\Customer;
 
    use Doctrine\ORM\Mapping as ORM;
+   use PayPlug\SyliusPayPlugPlugin\Entity\CardsOwnerInterface;
    use PayPlug\SyliusPayPlugPlugin\Entity\Traits\CustomerTrait;
    use Sylius\Component\Core\Model\Customer as BaseCustomer;
 
@@ -94,7 +95,7 @@ In local environment, the plugin will not work properly because you will not be
    */
    #[ORM\Entity]
    #[ORM\Table(name: 'sylius_customer')]
-   class Customer extends BaseCustomer
+   class Customer extends BaseCustomer implements CardsOwnerInterface
    {
       use CustomerTrait;
    }

composer.json

@@ -41,7 +41,6 @@
         "php-parallel-lint/php-parallel-lint": "1.4.0",
         "phpmd/phpmd": "^2.15.0",
         "phpro/grumphp": "^2.12",
-        "phpspec/phpspec": "7.5.0",
         "phpstan/extension-installer": "1.4.3",
         "phpstan/phpstan": "2.0.4",
         "phpstan/phpstan-doctrine": "2.0.1",

phpspec.yml.dist

@@ -11,9 +11,9 @@
         dirname(__DIR__, 1) . '/src',
         dirname(__DIR__, 1) . '/tests/Behat',
         dirname(__DIR__, 1) . '/tests/PHPUnit',
-        dirname(__DIR__, 1) . '/spec',
     ]);
 
     /** @phpstan-ignore-next-line  */
     $ecsConfig->rule(\SlevomatCodingStandard\Sniffs\Classes\RequireMultiLineMethodSignatureSniff::class);
-};
+    $ecsConfig->skip([\PhpCsFixer\Fixer\Basic\BracesFixer::class]);
+};

ruleset/ecs.php

@@ -3,7 +3,12 @@
          xsi:noNamespaceSchemaLocation="../vendor/squizlabs/php_codesniffer/phpcs.xsd">
     <arg name="colors"/>
     <arg name="extensions" value="php"/>
-    <rule ref="PSR12"/>
+    <rule ref="PSR12">
+        <!-- This rules doesn't match with single_line_empty_body -->
+        <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/>
+        <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore"/>
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine"/>
+    </rule>
 
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
@@ -16,4 +21,4 @@
             </property>
         </properties>
     </rule>
-</ruleset>
+</ruleset>