Clean up dependencies now that we have some stable releases. Adjust p…

…hp versions used in tests.
consolidation · Apr 5, 2024 · e5a884b · e5a884b
1 parent 9dcba4b
commit e5a884b
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 221 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           coverage: none
 
       - name: Install dependencies
@@ -53,7 +53,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.2
           coverage: none
           extensions: intl
 
@@ -82,7 +82,7 @@ jobs:
           - windows-latest
 
         php-version:
-          - "8.0"
+          - "8.2"
 
         php-ini-values:
           - assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit_buffer_size=4096M, opcache.jit=1205
@@ -92,7 +92,13 @@ jobs:
 
         include:
           - os: ubuntu-latest
-            php-version: "8.1"
+            php-version: "8.0"
+            dependencies: highest
+            php-ini-values: assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit_buffer_size=4096M, opcache.jit=1205
+
+        include:
+          - os: ubuntu-latest
+            php-version: "8.3"
             dependencies: highest
             php-ini-values: assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit_buffer_size=4096M, opcache.jit=1205
 

diff --git a/composer.json b/composer.json
@@ -22,20 +22,10 @@
             "Consolidation\\SiteProcess\\": "tests/src"
         }
     },
-    "repositories": {
-        "sf7_site-alias": {
-            "type": "vcs",
-            "url": "https://github.com/larowlan/site-alias"
-        },
-        "sf7_config": {
-            "type": "vcs",
-            "url": "https://github.com/larowlan/config"
-        }
-    },
     "require": {
         "php": ">=8.0.14",
-        "consolidation/config": "^2 || dev-symfony7",
-        "consolidation/site-alias": "^3 || ^4 || dev-symfony7",
+        "consolidation/config": "^2 || ^3",
+        "consolidation/site-alias": "^3 || ^4",
         "symfony/process": "^6 || ^7",
         "symfony/console": "^5.4 || ^6 || ^7"
     },
@@ -61,7 +51,7 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "platform": {
-            "php": "8.0.14"
+            "php": "8.2.17"
         },
         "allow-plugins": {
             "ocramius/package-versions": true