Merge 2434587 into 6ace511

SolidInvoice · Sep 6, 2022 · b330702 · b330702
2 parents 6ace511 + 2434587
commit b330702
Show file tree

Hide file tree

Showing 9 changed files with 520 additions and 120 deletions.
diff --git a/.github/workflows/cs.yml b/.github/workflows/cs.yml
@@ -22,9 +22,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Run composer normalize
-        uses: docker://ergebnis/composer-normalize-action:latest
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
 
+      - name: Install dependencies
+        run: composer install --no-scripts
+
+      - name: Run composer normalize
+        run: composer normalize --no-update-lock --diff --dry-run
 
   lint:
     name: Lint

diff --git a/.github/workflows/security-checker.yml b/.github/workflows/security-checker.yml
@@ -10,5 +10,5 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: symfonycorp/security-checker-action@v1
+      - uses: symfonycorp/security-checker-action@v3
 
diff --git a/composer.json b/composer.json
@@ -1,20 +1,20 @@
 {
     "name": "solidinvoice/solidinvoice",
-    "type": "application",
     "description": "General Billing Application",
+    "license": "MIT",
+    "type": "application",
     "keywords": [
         "billing",
         "general billing",
         "open-source billing"
     ],
-    "homepage": "http://solidinvoice.co",
-    "license": "MIT",
     "authors": [
         {
             "name": "Pierre du Plessis",
             "email": "info@solidinvoice.co"
         }
     ],
+    "homepage": "http://solidinvoice.co",
     "require": {
         "php": ">=7.3",
         "ext-curl": "*",
@@ -58,7 +58,7 @@
         "payum/paypal-pro-checkout-nvp": "^1.5",
         "payum/payum-bundle": "^2.3",
         "payum/stripe": "^1.5",
-        "php-http/guzzle6-adapter": "^2.0",
+        "php-http/guzzle7-adapter": "^1.0",
         "ramsey/uuid": "^3.9",
         "ramsey/uuid-doctrine": "^1.5",
         "sensio/framework-extra-bundle": "^5.5",
@@ -122,6 +122,7 @@
         "dama/doctrine-test-bundle": "^6.3",
         "dbrekelmans/bdi": "^1.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "ergebnis/composer-normalize": "^2.20",
         "fzaninotto/faker": "^1.9",
         "liip/test-fixtures-bundle": "^1.6",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
@@ -138,7 +139,17 @@
         "symfony/phpunit-bridge": "^5.0",
         "symfony/web-profiler-bundle": "^4.4"
     },
+    "autoload": {
+        "psr-4": {
+            "SolidInvoice\\": "src/"
+        }
+    },
     "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true,
+            "phpstan/extension-installer": true,
+            "symfony/flex": true
+        },
         "bin-dir": "bin",
         "platform": {
             "php": "7.3.5"
@@ -153,11 +164,6 @@
             "allow-contrib": true
         }
     },
-    "autoload": {
-        "psr-4": {
-            "SolidInvoice\\": "src/"
-        }
-    },
     "scripts": {
         "post-install-cmd": [
             "cp .env.dist .env",