Removing support of D9 and PHP 8.0 (#480)

* Removing support of D9 and PHP 8.0
apigee · Feb 29, 2024 · 2d33341 · 2d33341
1 parent ed4a0df
commit 2d33341
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -32,21 +32,14 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
           - "8.2"
         drupal-core:
           # Should update the following as the minimum supported version from Drupal.org
-          - "9.5.x"
           - "10.1.x"
         instance-type:
           - "Edge"
           - "X"
-        exclude:
-          - php-version: "8.2"
-            drupal-core: "9.5.x"
-          - php-version: "8.0"
-            drupal-core: "10.1.x"
 
     steps:
 
@@ -77,14 +70,14 @@ jobs:
         echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: ${{ runner.os }}-composer-
 
     - name: Checkout apigee_m10n module
-      uses: actions/checkout@v3.0.0
+      uses: actions/checkout@v3
       with:
         path: drupal/modules/contrib/apigee_m10n
 
@@ -143,13 +136,13 @@ jobs:
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
 
     - name: "Run PHPUnit tests"
-      if: ${{ matrix.drupal-core != '9.5.x' || matrix.php-version != '8.1' }}
+      if: ${{ matrix.drupal-core != '10.1.x' || matrix.php-version != '8.1' }}
       run: |
         cd drupal
         vendor/bin/phpunit -c core --verbose --color --group apigee_m10n --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_m10n
 
     - name: "Run PHPUnit tests with Code Coverage"
-      if: ${{ matrix.drupal-core == '9.5.x' && matrix.php-version == '8.1' }}
+      if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }}
       run: |
         cd drupal
         cp modules/contrib/apigee_m10n/phpunit.core.xml.dist core/phpunit.xml
@@ -163,7 +156,7 @@ jobs:
         path: drupal/sites/simpletest/browser_output/*
 
     - name: Upload coverage to Codecov
-      if: ${{ matrix.drupal-core == '9.5.x' && matrix.php-version == '8.1' }}
+      if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }}
       uses: codecov/codecov-action@v3
       with:
         files: /tmp/coverage_${{ matrix.instance-type }}.xml

diff --git a/apigee_m10n.info.yml b/apigee_m10n.info.yml
@@ -3,11 +3,11 @@ description: Apigee Edge Monetization Drupal integration
 package: Apigee
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - apigee_edge:apigee_edge
   - drupal:link
   - requirement:requirement
 
-php: 8.0
+php: 8.1
diff --git a/composer.json b/composer.json
@@ -4,20 +4,20 @@
     "type": "drupal-module",
     "description": "Apigee Edge Monetization for Drupal",
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-bcmath": "*",
         "cweagans/composer-patches": "~1.6",
-        "commerceguys/intl": "~1.0 || ^2.0",
-        "drupal/apigee_edge": "^2.0.2 || ^3.0.0",
-        "drupal/core": "^9.5 || ^10.1",
+        "commerceguys/intl": "^2.0",
+        "drupal/apigee_edge": "^3.0.0",
+        "drupal/core": "^10.1",
         "drupal/requirement": "^1.2",
         "drupal/jquery_ui_dialog": "^2.0",
-        "apigee/apigee-client-php": "^2.0.16 || ^3.0.0"
+        "apigee/apigee-client-php": "^3.0.0"
     },
     "require-dev": {
         "apigee/apigee-mock-client-php": "^1.1.1",
-        "drupal/drupal-extension": "^4.2.1 || ~5",
-        "drupal/core-dev": "^9.5 || ^10.1",
+        "drupal/drupal-extension": "~5",
+        "drupal/core-dev": "^10.1",
         "drush/drush": "^11.5",
         "mglaman/drupal-check": "^1.3",
         "phpmd/phpmd": "^2.8.2",

diff --git a/modules/apigee_m10n_add_credit/apigee_m10n_add_credit.info.yml b/modules/apigee_m10n_add_credit/apigee_m10n_add_credit.info.yml
@@ -3,7 +3,7 @@ description: Provides the ability to create a Drupal Commerce "Add Credit" produ
 package: Apigee
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - apigee_m10n:apigee_m10n
@@ -16,4 +16,4 @@ dependencies:
   - commerce:commerce_checkout
   - jquery_ui_dialog:jquery_ui_dialog
 
-php: 8.0
+php: 8.1
diff --git a/modules/apigee_m10n_teams/apigee_m10n_teams.info.yml b/modules/apigee_m10n_teams/apigee_m10n_teams.info.yml
@@ -3,10 +3,10 @@ description: Adds monetization support for Apigee Edge Teams.
 package: Apigee (Experimental)
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - apigee_m10n:apigee_m10n
   - apigee_edge:apigee_edge_teams
 
-php: 8.0
+php: 8.1