Merge pull request #5 from FLUX-SE/3.0

Prometee · web-flow · commit 31c63ca6f036 · 2025-01-09T16:43:28.000+01:00
Clean deps and upgrade to Symfony 7
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,23 +19,15 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0]
-                symfony: [^4.4, ^5.4, ^6.0]
-
-                exclude:
-                    -
-                        php: 7.3
-                        symfony: ^6.0
-                    -
-                        php: 7.4
-                        symfony: ^6.0
+                php: [8.2, 8.3, 8.4]
+                symfony: [^6.4, ^7.2]
 
         env:
             APP_ENV: test
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
@@ -53,11 +45,11 @@ jobs:
             -
                 name: Get Composer cache directory
                 id: composer-cache
-                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             -
                 name: Cache Composer
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
diff --git a/composer.json b/composer.json
@@ -6,32 +6,36 @@
     "require": {
         "flux-se/payum-stripe": "^2.0",
         "payum/payum-bundle": "^2.4",
-        "symfony/http-kernel": "^4.4|^5.4|^6.0",
-        "symfony/dependency-injection": "^4.4|^5.4|^6.0",
-        "symfony/config": "^4.4|^5.4|^6.0"
+        "symfony/http-kernel": "^6.4 | ^7.2",
+        "symfony/dependency-injection": "^6.4 | ^7.2",
+        "symfony/config": "^6.4 | ^7.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8|^9",
-        "symplify/easy-coding-standard": "^11",
+        "phpunit/phpunit": "^10",
+        "symplify/easy-coding-standard": "^12",
         "php-http/guzzle6-adapter": "^2.0",
-        "phpstan/phpstan": "^1",
-        "vimeo/psalm": "^4.3"
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-symfony": "^1.4"
     },
     "autoload": {
         "psr-4": { "FluxSE\\PayumStripeBundle\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Tests\\FluxSE\\PayumStripeBundle\\": "tests/" }
     },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
+    },
     "scripts": {
         "analyse": [
             "@composer validate --strict",
-            "vendor/bin/ecs check .",
-            "vendor/bin/phpstan.phar analyse -c phpstan.neon -l max src/",
-            "vendor/bin/psalm"
+            "vendor/bin/ecs check",
+            "vendor/bin/phpstan.phar analyse"
         ],
         "fix": [
-            "vendor/bin/ecs check . --fix"
+            "vendor/bin/ecs check --fix"
         ]
     },
     "extra": {
diff --git a/config/services.yaml b/config/services.yaml
diff --git a/ecs.php b/ecs.php
@@ -4,6 +4,12 @@
 
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ECSConfig $ecsConfig): void {
-    $ecsConfig->import(__DIR__ . '/vendor/symplify/easy-coding-standard/config/set/psr12.php');
-};
+return ECSConfig::configure()
+    ->withSets([
+        'vendor/symplify/easy-coding-standard/config/set/psr12.php',
+    ])
+    ->withPaths([
+        'src',
+        'tests',
+    ])
+;
diff --git a/phpstan.neon b/phpstan.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,6 +1,8 @@
 parameters:
     reportUnmatchedIgnoredErrors: false
 
+    level: max
+
     paths:
         - src
         - tests
diff --git a/src/DependencyInjection/FluxSEPayumStripeExtension.php b/src/DependencyInjection/FluxSEPayumStripeExtension.php
@@ -12,16 +12,11 @@
 
 class FluxSEPayumStripeExtension extends Extension
 {
-    /**
-     * @param string[] $configs
-     *
-     * @throws Exception
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader(
             $container,
-            new FileLocator(dirname(__DIR__) . '/Resources/config')
+            new FileLocator(dirname(__DIR__) . '/../config')
         );
         $loader->load('services.yaml');
     }
diff --git a/src/FluxSEPayumStripeBundle.php b/src/FluxSEPayumStripeBundle.php
@@ -8,4 +8,8 @@
 
 class FluxSEPayumStripeBundle extends Bundle
 {
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,11 @@`
`12`	`12`
`13`	`13`	`class FluxSEPayumStripeExtension extends Extension`
`14`	`14`	`{`
`15`		`- /**`
`16`		`- * @param string[] $configs`
`17`		`- *`
`18`		`- * @throws Exception`
`19`		`- */`
`20`	`15`	`public function load(array $configs, ContainerBuilder $container): void`
`21`	`16`	`{`
`22`	`17`	`$loader = new YamlFileLoader(`
`23`	`18`	`$container,`
`24`		`- new FileLocator(dirname(__DIR__) . '/Resources/config')`
	`19`	`+ new FileLocator(dirname(__DIR__) . '/../config')`
`25`	`20`	`);`
`26`	`21`	`$loader->load('services.yaml');`
`27`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,8 @@`
`8`	`8`
`9`	`9`	`class FluxSEPayumStripeBundle extends Bundle`
`10`	`10`	`{`
	`11`	`+ public function getPath(): string`
	`12`	`+ {`
	`13`	`+ return dirname(__DIR__);`
	`14`	`+ }`
`11`	`15`	`}`