Updated dev dependencies to run on PHP 7.4

scoutapp · Jun 4, 2024 · bf9c871 · bf9c871
1 parent 2281146
commit bf9c871
Show file tree

Hide file tree

Showing 10 changed files with 2,108 additions and 1,231 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -235,8 +235,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          php-version: "7.2"
-          tools: composer:v2.3
+          php-version: "7.4"
+          tools: composer:v2.6
         env:
           fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -254,8 +254,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          php-version: "7.2"
-          tools: composer:v2.3
+          php-version: "7.4"
+          tools: composer:v2.6
         env:
           fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: *
 
-PHP_VERSION=7.2
+PHP_VERSION=7.4
 PHP_PATH=/usr/bin/env php$(PHP_VERSION)
 COMPOSER_PATH=/usr/local/bin/composer
 OPTS=

diff --git a/composer.json b/composer.json
@@ -26,23 +26,23 @@
     "require-dev": {
         "composer-plugin-api": "^2.0",
         "api-ecosystem-for-laravel/dingo-api": "^3.0|^4.0",
-        "doctrine/coding-standard": "^10.0",
+        "doctrine/coding-standard": "^12.0",
         "guzzlehttp/guzzle": "^7.4",
         "laravel/framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
         "laravel/lumen-framework": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
         "monolog/monolog": "^1.27|^2.5|^3.0",
-        "nesbot/carbon": "^2.62.1",
+        "nesbot/carbon": "^2.62.1 || ^3.5",
         "nyholm/psr7": "^1.5",
         "phpunit/phpunit": "^8.5.22|^9.5.2",
-        "psalm/plugin-phpunit": "^0.16.1",
+        "psalm/plugin-phpunit": "^0.16.1 || ^0.17 || ^0.18 || ^0.19",
         "symfony/config": "^4.0 || ^5.0 || ^6.0",
         "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0",
         "symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0",
         "symfony/http-kernel": "^4.0 || ^5.0 || ^6.0",
         "symfony/orm-pack": "^2.0",
         "symfony/process": "^3.0 || ^4.0 || ^5.0 || ^6.0",
         "symfony/twig-pack": "^1.0",
-        "vimeo/psalm": "^4.23"
+        "vimeo/psalm": "^4.23 || ^5.24"
     },
     "suggest": {
         "composer-runtime-api": "Composer v2 is required for seeing version information in metadata",