Bumped version for Drupal10 support (#844)

* Changes for Drupal10 prep Co-authored-by: Vladimir Roudakov <[email protected]> * added Drupal 10 in actions * Bumped rules module for Drupal 10 support * bumped drupal version in info file * changes in require-dev Co-authored-by: Vladimir Roudakov <[email protected]> Co-authored-by: giteshk <giteshk@users.noreply.github.com> * rolled back workflow changes for better tracking * bumped core version to support only Drupal 10, added guzzle7-adapter --------- Co-authored-by: Vladimir Roudakov <[email protected]> Co-authored-by: giteshk <giteshk@users.noreply.github.com>
apigee · Jun 9, 2023 · 02955ff · 02955ff
1 parent 56f012c
commit 02955ff
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 34 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -29,13 +29,10 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
         drupal-core:
           # Should update the following as the minimum supported version from Drupal.org
-          - "9.4.x"
-          - "9.5.x"
+          - "10.0.x"
 
     steps:
 
@@ -90,7 +87,7 @@ jobs:
         composer config --no-plugins allow-plugins.php-http/discovery true        
         composer require --dev drush/drush
         composer config minimum-stability dev
-        composer require drupal/rules:3.0.0-alpha7
+        composer require 'drupal/rules:3.x-dev@dev'
         composer require wikimedia/composer-merge-plugin
         composer config --json extra.merge-plugin.require '["modules/contrib/apigee_edge/composer.json"]'
         composer config platform.php ${{ matrix.php-version }}

diff --git a/apigee_edge.info.yml b/apigee_edge.info.yml
@@ -3,7 +3,7 @@ description: Apigee Edge Drupal integration.
 package: Apigee
 
 type: module
-core_version_requirement: ^8.7.7 || ^9
+core_version_requirement: ^10
 
 dependencies:
   - drupal:file
@@ -16,4 +16,4 @@ dependencies:
 
 configure: apigee_edge.settings
 
-php: "7.1"
+php: "8.1"
diff --git a/composer.json b/composer.json
@@ -4,21 +4,20 @@
     "type": "drupal-module",
     "description": "Apigee Edge for Drupal.",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "~8.1",
         "ext-json": "*",
-        "apigee/apigee-client-php": "^2.0.19",
-        "drupal/core": "^9.4",
+        "apigee/apigee-client-php": "dev-drupal10-prep",
+        "drupal/core": "^10.0",
         "drupal/entity": "^1.0",
         "drupal/key": "^1.8",
-        "php-http/guzzle6-adapter": "^2.0"
+        "php-http/guzzle7-adapter": "^1.0"
     },
     "require-dev": {
-        "apigee/apigee-mock-client-php": "^1.1.1",
-        "behat/mink-extension": "^2.0",
-        "bex/behat-screenshot": "^1.2",
+        "apigee/apigee-mock-client-php": "dev-drupal10-prep",
+        "drupal/drupal-extension": "^4.2.1 || ~5",
         "cweagans/composer-patches": "^1.6",
-        "drupal/core-dev": "^9.4",
-        "drush/drush": "^9.0 || ^10.0",
+        "drupal/core-dev": "^10.0",
+        "drush/drush": "^11.5",
         "mglaman/drupal-check": "1.3",
         "phpmd/phpmd": "^2.8.2",
         "phpmetrics/phpmetrics": "^2.5",

diff --git a/modules/apigee_edge_actions/apigee_edge_actions.info.yml b/modules/apigee_edge_actions/apigee_edge_actions.info.yml
@@ -2,7 +2,7 @@ name: Apigee Edge Actions
 description: Rules integration for Apigee Edge.
 package: Apigee (Experimental)
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 configure: entity.rules_reaction_rule.collection
 dependencies:
   - apigee_edge:apigee_edge

diff --git a/modules/apigee_edge_actions/composer.json b/modules/apigee_edge_actions/composer.json
@@ -4,7 +4,7 @@
     "type": "drupal-module",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": ">=7.1",
+        "php": "~8.1",
         "drupal/apigee_edge": "*",
         "drupal/rules": "3.0.0-alpha7"
     },

diff --git a/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.info.yml b/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.info.yml
@@ -3,11 +3,11 @@ description: Role based access control over view operation on API products.
 package: Apigee
 
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 
 dependencies:
   - apigee_edge:apigee_edge
 
 configure: apigee_edge.settings.developer.api_product_access
 
-php: "7.1"
+php: "8.1"
diff --git a/modules/apigee_edge_apiproduct_rbac/composer.json b/modules/apigee_edge_apiproduct_rbac/composer.json
@@ -4,7 +4,7 @@
     "type": "drupal-module",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": ">=7.1",
+        "php": "~8.1",
         "drupal/apigee_edge": "*"
     },
     "config": {

diff --git a/modules/apigee_edge_debug/apigee_edge_debug.info.yml b/modules/apigee_edge_debug/apigee_edge_debug.info.yml
@@ -3,11 +3,11 @@ description: Debug helper for Apigee Edge Drupal integration.
 package: Apigee
 
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 
 dependencies:
   - apigee_edge:apigee_edge
 
 configure: apigee_edge_debug.settings
 
-php: "7.1"
+php: "8.1"
diff --git a/modules/apigee_edge_debug/composer.json b/modules/apigee_edge_debug/composer.json
@@ -4,7 +4,7 @@
     "type": "drupal-module",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": ">=7.1",
+        "php": "~8.1",
         "drupal/apigee_edge": "*",
         "guzzlehttp/guzzle": "^6.1.0"
     },

diff --git a/modules/apigee_edge_teams/apigee_edge_teams.info.yml b/modules/apigee_edge_teams/apigee_edge_teams.info.yml
@@ -3,7 +3,7 @@ description: Provides shared app functionality by allowing developers to be orga
 package: Apigee
 
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 
 dependencies:
   - apigee_edge:apigee_edge
@@ -12,4 +12,4 @@ dependencies:
 
 configure: apigee_edge_teams.settings.team
 
-php: "7.1"
+php: "8.1"
diff --git a/modules/apigee_edge_teams/composer.json b/modules/apigee_edge_teams/composer.json
@@ -4,7 +4,7 @@
     "type": "drupal-module",
     "license": "GPL-2.0+",
     "require": {
-        "php": ">=7.1",
+        "php": "~8.1",
         "drupal/apigee_edge": "*"
     },
     "config": {

diff --git a/...ests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml b/...ests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml
@@ -1,7 +1,7 @@
 name: 'Apigee Edge Teams: Invitation tests'
 type: module
 description: 'Support module for the Apigee Edge Teams invitation tests.'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 package: Testing
 
 dependencies:

diff --git a/...es/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml b/...es/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml
@@ -1,7 +1,7 @@
 name: 'Apigee Edge Teams: Testing'
 type: module
 description: 'Support module for the Apigee Edge Teams tests.'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 package: Testing
 
 dependencies:

diff --git a/src/SDKConnector.php b/src/SDKConnector.php
@@ -35,7 +35,7 @@
 use Drupal\Core\Http\ClientFactory;
 use Drupal\key\KeyInterface;
 use Drupal\key\KeyRepositoryInterface;
-use Http\Adapter\Guzzle6\Client as GuzzleClientAdapter;
+use Http\Adapter\Guzzle7\Client as GuzzleClientAdapter;
 use Http\Message\Authentication;
 
 /**

diff --git a/tests/modules/apigee_edge_test/apigee_edge_test.info.yml b/tests/modules/apigee_edge_test/apigee_edge_test.info.yml
@@ -1,7 +1,7 @@
 name: 'Apigee Edge Testing'
 type: module
 description: 'Support module for the Apigee Edge tests.'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 package: Testing
 
 dependencies:

diff --git a/tests/modules/apigee_edge_test_app_keys/apigee_edge_test_app_keys.info.yml b/tests/modules/apigee_edge_test_app_keys/apigee_edge_test_app_keys.info.yml
@@ -1,7 +1,7 @@
 name: 'Apigee Edge Testing: App keys'
 type: module
 description: 'Support module for the Apigee Edge tests: Mocks app key generation via a 3rd party service.'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 package: Testing
 
 dependencies:

diff --git a/tests/modules/apigee_mock_api_client/apigee_mock_api_client.info.yml b/tests/modules/apigee_mock_api_client/apigee_mock_api_client.info.yml
@@ -3,9 +3,9 @@ description: Helpers and an API middleware used for testing.
 package: Apigee
 
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^10
 
 dependencies:
   - apigee_edge:apigee_edge
 
-php: "7.1"
+php: "8.0"