Skip to content

Commit

Permalink
Merge pull request #247 from kedarkhaire/issue-245
Browse files Browse the repository at this point in the history
Removing support of PHP 8.0 & D9
  • Loading branch information
kedarkhaire authored Feb 29, 2024
2 parents 3ea9ecc + be64a34 commit e1b4307
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 17 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,11 @@ 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"
exclude:
- php-version: "8.2"
drupal-core: "9.5.x"
- php-version: "8.0"
drupal-core: "10.1.x"

steps:

Expand Down Expand Up @@ -116,13 +109,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_api_catalog --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_api_catalog
- 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_api_catalog/phpunit.core.xml.dist core/phpunit.xml
Expand All @@ -136,7 +129,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.xml
Expand Down
2 changes: 1 addition & 1 deletion apigee_api_catalog.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Apigee API Catalog'
type: module
description: 'Display OpenAPI documentation of your APIs to your developers.'
core_version_requirement: ^9 || ^10
core_version_requirement: ^10
package: 'Apigee'
dependencies:
- drupal:text
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"type": "drupal-module",
"description": "Apigee API Catalog for Drupal",
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"drupal/entity": "^1.1",
"drupal/file_link": "^2.0",
"drupal/apigee_edge": "^2.0 || ^3.0.0",
"drupal/apigee_edge": "^3.0.0",
"webonyx/graphql-php": "^14.11"
},
"require-dev": {
"cweagans/composer-patches": "^1.6",
"drupal/core-dev": "^9.5 || ^10.1",
"drupal/core-dev": "^10.1",
"drush/drush": "^11.5",
"mglaman/drupal-check": "^1.3",
"phpmd/phpmd": "^2.8.2",
Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_asyncapi_doc/apigee_asyncapi_doc.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: AsyncAPI for Apigee
type: module
description: AsyncAPI for Apigee
package: Apigee (Experimental)
core_version_requirement: ^9 || ^10
core_version_requirement: ^10
dependencies:
- apigee_api_catalog
- file_link
Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_freeform_doc/apigee_freeform_doc.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Free-form documentation for Apigee
type: module
description: Free-form documentation for Apigee
package: Apigee (Experimental)
core_version_requirement: ^9 || ^10
core_version_requirement: ^10
dependencies:
- apigee_api_catalog
- file
Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_graphql_doc/apigee_graphql_doc.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: GraphQL for Apigee
type: module
description: GraphQL for Apigee
package: Apigee (Experimental)
core_version_requirement: ^9 || ^10
core_version_requirement: ^10
dependencies:
- apigee_api_catalog
- file_link
Expand Down

0 comments on commit e1b4307

Please sign in to comment.