Merge pull request #711 from Ocramius/feature/dependency-cleanup

Dependency upgrades and general cleanup
Ocramius · Jul 13, 2021 · b19ebfd · b19ebfd
2 parents 21e2b4a + 410e0e1
commit b19ebfd
Show file tree

Hide file tree

Showing 106 changed files with 725 additions and 794 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,7 +15,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/demo-scripts.yml b/.github/workflows/demo-scripts.yml
@@ -15,7 +15,6 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
           - "8.0"
         operating-system:
           - "ubuntu-latest"

diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -53,7 +53,7 @@ jobs:
         run: "composer install --no-interaction --no-progress --no-suggest"
 
       - name: "Infection"
-        run: "./vendor/bin/infection --test-framework-options='--testsuite=unit'"
+        run: "./vendor/bin/roave-infection-static-analysis-plugin --test-framework-options='--testsuite=unit'"
         env:
           INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -17,7 +17,6 @@ jobs:
           - "highest"
           - "locked"
         php-version:
-          - "7.4"
           - "8.0"
         operating-system:
           - "ubuntu-latest"

diff --git a/composer.json b/composer.json
@@ -19,28 +19,23 @@
         }
     ],
     "require": {
-        "php":                       "~7.4.1 || ~8.0.0",
-        "laminas/laminas-code":      "^4.3.0",
+        "php":                       "~8.0.0",
         "composer-runtime-api":      "^2.1.0",
+        "laminas/laminas-code":      "^4.4.2",
         "webimpress/safe-writer":    "^2.2.0"
     },
     "conflict": {
-        "zendframework/zend-stdlib": "<3.2.1",
-        "laminas/laminas-stdlib":    "<3.2.1",
-        "doctrine/annotations":      "<1.6.1",
-        "thecodingmachine/safe":     "<1.3.3"
+        "thecodingmachine/safe": "<1.3.3"
     },
     "require-dev": {
-        "ext-phar":                     "*",
-        "phpunit/phpunit":              "^9.5.4",
-        "squizlabs/php_codesniffer":    "^3.6.0",
-        "slevomat/coding-standard":     "^6.3.10",
-        "doctrine/coding-standard":     "^8.2.1",
-        "nikic/php-parser":             "^4.10.5",
-        "phpbench/phpbench":            "^0.17.1 || 1.0.0-alpha2",
-        "infection/infection":          "^0.21.5",
-        "vimeo/psalm":                  "^4.4.1",
-        "codelicia/xulieta":            "^0.1.6"
+        "ext-phar":                               "*",
+        "codelicia/xulieta":                      "^0.1.6",
+        "doctrine/coding-standard":               "^9.0.0",
+        "phpbench/phpbench":                      "^1.0.3",
+        "phpunit/phpunit":                        "^9.5.6",
+        "roave/infection-static-analysis-plugin": "^1.8",
+        "squizlabs/php_codesniffer":              "^3.6.0",
+        "vimeo/psalm":                            "^4.8.1"
     },
     "suggest": {
         "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
@@ -61,9 +56,7 @@
             "Laminas\\Server\\": "tests/Stubbed/Laminas/Server"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        }
+    "config": {
+        "sort-packages": true
     }
 }