diff --git a/apigee_edge.info.yml b/apigee_edge.info.yml index 66e8fe600..00e07d50e 100644 --- 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 index b106cd621..9cbf59352 100644 --- 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/modules/apigee_edge_actions/modules/apigee_edge_actions_debug/apigee_edge_actions_debug.info.yml b/modules/apigee_edge_actions/modules/apigee_edge_actions_debug/apigee_edge_actions_debug.info.yml index 82c2bfe2d..14ab2cb17 100644 --- a/modules/apigee_edge_actions/modules/apigee_edge_actions_debug/apigee_edge_actions_debug.info.yml +++ b/modules/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/modules/apigee_edge_actions/modules/apigee_edge_actions_examples/apigee_edge_actions_examples.info.yml b/modules/apigee_edge_actions/modules/apigee_edge_actions_examples/apigee_edge_actions_examples.info.yml index 48a45a634..34fa989c3 100644 --- a/modules/apigee_edge_actions/modules/apigee_edge_actions_examples/apigee_edge_actions_examples.info.yml +++ b/modules/apigee_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 index 8539f2bad..57e1e69cf 100644 --- 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 index 3659ac1b4..58e4026d5 100644 --- 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 index 4918d1e41..770e88520 100644 --- 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 index bf8ce1257..5b67854e9 100644 --- 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 index 4898cb7c3..04d402d76 100644 --- 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 index 461ae109c..1deed7715 100644 --- 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 index 129d0f0ef..8f36d1428 100644 --- 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 index bd20b857a..ccfd9c8bd 100644 --- 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 index 44180c3ef..83ec61f4e 100644 --- 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 index 38c0dd6b3..b0ccc81e4 100644 --- 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 index 7543f60b5..e1085e6ee 100644 --- 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"