Core version requirement updated to v11 for D11 (#1114)

apigee · Jan 20, 2025 · 1142ca0 · 1142ca0
1 parent fc48d5c
commit 1142ca0
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 21 deletions.
diff --git a/apigee_edge.info.yml b/apigee_edge.info.yml
@@ -3,7 +3,7 @@ description: Apigee Drupal integration.
 package: Apigee
 
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^11
 
 dependencies:
   - drupal:file
@@ -12,8 +12,8 @@ dependencies:
   - drupal:filter
   - drupal:options
   - key:key
-  - drupal:system (>=8.7.0)
+  - drupal:system
 
 configure: apigee_edge.settings
 
-php: 8.1
+php: 8.3
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: ^10
+core_version_requirement: ^11
 configure: entity.rules_reaction_rule.collection
 dependencies:
   - apigee_edge:apigee_edge

diff --git a/.../apigee_edge_actions/modules/apigee_edge_actions_debug/apigee_edge_actions_debug.info.yml b/.../apigee_edge_actions/modules/apigee_edge_actions_debug/apigee_edge_actions_debug.info.yml
@@ -2,6 +2,6 @@ name: Apigee Edge Actions Debug
 description: Logs debug information for Apigee Edge Actions.
 package: Apigee (Experimental)
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^11
 dependencies:
   - apigee_edge_actions:apigee_edge_actions
diff --git a/...e_edge_actions/modules/apigee_edge_actions_examples/apigee_edge_actions_examples.info.yml b/...e_edge_actions/modules/apigee_edge_actions_examples/apigee_edge_actions_examples.info.yml
@@ -2,7 +2,7 @@ name: Apigee Edge Actions Examples
 description: Example rules for Apigee Edge.
 package: Apigee (Experimental)
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^11
 configure: entity.rules_reaction_rule.collection
 dependencies:
   - apigee_edge_actions:apigee_edge_actions

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: ^10
+core_version_requirement: ^11
 
 dependencies:
   - apigee_edge:apigee_edge
 
 configure: apigee_edge.settings.developer.api_product_access
 
-php: "8.1"
+php: "8.3"
diff --git a/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.libraries.yml b/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.libraries.yml
@@ -1,4 +1,4 @@
-admin:
+apigee_edge_apiproduct_rbac.admin:
   version: 1.1
   css:
     theme:

diff --git a/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.module b/modules/apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.module
@@ -233,7 +233,7 @@ function apigee_edge_apiproduct_rbac_form_apigee_edge_api_product_access_control
     '#value' => $product_names,
   ];
 
-  $form['#attached']['library'][] = 'apigee_edge_apiproduct_rbac/admin';
+  $form['#attached']['library'][] = 'apigee_edge_apiproduct_rbac/apigee_edge_apiproduct_rbac.admin';
   $form['#submit'][] = 'apigee_edge_apiproduct_rbac_form_apigee_edge_api_product_access_control_form_submit';
 }
 

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: ^10
+core_version_requirement: ^11
 
 dependencies:
   - apigee_edge:apigee_edge
 
 configure: apigee_edge_debug.settings
 
-php: "8.1"
+php: "8.3"
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: ^10
+core_version_requirement: ^11
 
 dependencies:
   - apigee_edge:apigee_edge

diff --git a/modules/apigee_edge_teams/config/optional/views.view.team_invitations.yml b/modules/apigee_edge_teams/config/optional/views.view.team_invitations.yml
@@ -662,7 +662,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true
@@ -767,7 +766,6 @@ display:
           default_argument_type: user
           default_argument_options:
             user: false
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true

diff --git a/src/Entity/FieldableEdgeEntityBase.php b/src/Entity/FieldableEdgeEntityBase.php
@@ -78,7 +78,7 @@ abstract class FieldableEdgeEntityBase extends EdgeEntityBase implements Fieldab
   /**
    * {@inheritdoc}
    */
-  public function __sleep() {
+  public function __sleep(): array {
     $this->fields = [];
     $this->fieldDefinitions = NULL;
     return parent::__sleep();

diff --git a/src/MemoryCacheFactory.php b/src/MemoryCacheFactory.php
@@ -20,6 +20,7 @@
 
 namespace Drupal\apigee_edge;
 
+use Drupal\Component\Datetime\Time;
 use Drupal\Core\Cache\MemoryCache\MemoryCache;
 use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
 
@@ -65,7 +66,7 @@ public function __construct(?string $prefix = NULL) {
   public function get($bin): MemoryCacheInterface {
     $bin = "{$this->prefix}_{$bin}";
     if (!isset($this->bins[$bin])) {
-      $this->bins[$bin] = new MemoryCache();
+      $this->bins[$bin] = new MemoryCache(new Time());
     }
     return $this->bins[$bin];
   }

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: ^10
+core_version_requirement: ^11
 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: ^10
+core_version_requirement: ^11
 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: ^10
+core_version_requirement: ^11
 
 dependencies:
   - apigee_edge:apigee_edge
 
-php: "8.0"
+php: "8.3"