Skip to content

Core version requirement updated to v11 for D11 #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apigee_edge.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Apigee Drupal integration.
package: Apigee

type: module
core_version_requirement: ^10
core_version_requirement: ^11

dependencies:
- drupal:file
Expand All @@ -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
2 changes: 1 addition & 1 deletion modules/apigee_edge_actions/apigee_edge_actions.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
admin:
apigee_edge_apiproduct_rbac.admin:
version: 1.1
css:
theme:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

Expand Down
4 changes: 2 additions & 2 deletions modules/apigee_edge_debug/apigee_edge_debug.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion modules/apigee_edge_teams/apigee_edge_teams.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Entity/FieldableEdgeEntityBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/MemoryCacheFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/modules/apigee_edge_test/apigee_edge_test.info.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading