From 8f8d9274607a3b1eed3107d65304f725984f9023 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 18 Jun 2024 17:03:55 +0530 Subject: [PATCH 1/7] Changes for version support updates --- .github/workflows/php.yml | 9 +++++---- composer.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b56ed811..fdbcbad4 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,10 +34,11 @@ jobs: php-version: - "8.1" - "8.2" + - "8.3" drupal-core: # Should update the following as the minimum supported version from Drupal.org - - "10.1.x" - "10.2.x" + - "10.3.x" instance-type: - "Edge" - "X" @@ -137,13 +138,13 @@ jobs: sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - name: "Run PHPUnit tests" - if: ${{ matrix.drupal-core != '10.1.x' || matrix.php-version != '8.1' }} + if: ${{ matrix.drupal-core != '10.2.x' || matrix.php-version != '8.2' }} run: | cd drupal vendor/bin/phpunit -c core --verbose --color --group apigee_edge --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_edge - name: "Run PHPUnit tests with Code Coverage" - if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }} + if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }} run: | cd drupal cp modules/contrib/apigee_edge/phpunit.core.xml.dist core/phpunit.xml @@ -157,7 +158,7 @@ jobs: path: drupal/sites/simpletest/browser_output/* - name: Upload coverage to Codecov - if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }} + if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }} uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/composer.json b/composer.json index e652352d..80f849c0 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "description": "Apigee for Drupal.", "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-json": "*", "apigee/apigee-client-php": "~3.0.5", "drupal/core": "^10.1", From 2841548178858150ebc51b47addcc3ec2e98fdd2 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 19 Jun 2024 22:18:19 +0530 Subject: [PATCH 2/7] Replacing deprecated ModuleHandlerInterface --- modules/apigee_edge_teams/src/TeamPermissionHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/apigee_edge_teams/src/TeamPermissionHandler.php b/modules/apigee_edge_teams/src/TeamPermissionHandler.php index 5ab2d36e..0c0f9d48 100644 --- a/modules/apigee_edge_teams/src/TeamPermissionHandler.php +++ b/modules/apigee_edge_teams/src/TeamPermissionHandler.php @@ -299,7 +299,7 @@ protected function sortPermissions(array $all_permissions = []) { protected function getModuleNames(): array { $modules = []; foreach (array_keys($this->moduleHandler->getModuleList()) as $module) { - $modules[$module] = $this->moduleHandler->getName($module); + $modules[$module] = \Drupal::service('extension.list.module')->getName($module); } asort($modules); return $modules; From 2e27d37f4cddc6c574b377baf8cfd13fbb2dfc65 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 19 Jun 2024 22:27:26 +0530 Subject: [PATCH 3/7] Replacing deprecated class RenderElement with RenderElementBase --- src/Element/ApigeeEntityListElement.php | 6 +++--- src/Element/ApigeeSecret.php | 6 +++--- src/Element/AppCredentialElement.php | 6 +++--- src/Element/AppCredentialProductListElement.php | 6 +++--- src/Element/StatusPropertyElement.php | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Element/ApigeeEntityListElement.php b/src/Element/ApigeeEntityListElement.php index 14c476b5..071d2465 100644 --- a/src/Element/ApigeeEntityListElement.php +++ b/src/Element/ApigeeEntityListElement.php @@ -22,15 +22,15 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Render\Element\RenderElement; +use Drupal\Core\Render\Element\RenderElementBase; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides an element for listing Apigee entities. * - * @RenderElement("apigee_entity_list") + * @RenderElementBase("apigee_entity_list") */ -class ApigeeEntityListElement extends RenderElement implements ContainerFactoryPluginInterface { +class ApigeeEntityListElement extends RenderElementBase implements ContainerFactoryPluginInterface { /** * The entity type manager. diff --git a/src/Element/ApigeeSecret.php b/src/Element/ApigeeSecret.php index 056609b5..5249b874 100644 --- a/src/Element/ApigeeSecret.php +++ b/src/Element/ApigeeSecret.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElement; +use Drupal\Core\Render\Element\RenderElementBase; /** * Provides a secret element. * - * @RenderElement("apigee_secret") + * @RenderElementBase("apigee_secret") */ -class ApigeeSecret extends RenderElement { +class ApigeeSecret extends RenderElementBase { /** * {@inheritdoc} diff --git a/src/Element/AppCredentialElement.php b/src/Element/AppCredentialElement.php index 8cbd7767..4363e5ec 100644 --- a/src/Element/AppCredentialElement.php +++ b/src/Element/AppCredentialElement.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElement; +use Drupal\Core\Render\Element\RenderElementBase; /** * Provides an app credential element. * - * @RenderElement("app_credential") + * @RenderElementBase("app_credential") */ -class AppCredentialElement extends RenderElement { +class AppCredentialElement extends RenderElementBase { /** * {@inheritdoc} diff --git a/src/Element/AppCredentialProductListElement.php b/src/Element/AppCredentialProductListElement.php index e7badae0..074e7538 100644 --- a/src/Element/AppCredentialProductListElement.php +++ b/src/Element/AppCredentialProductListElement.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElement; +use Drupal\Core\Render\Element\RenderElementBase; /** * Provides a product listing element for app credentials. * - * @RenderElement("app_credential_product_list") + * @RenderElementBase("app_credential_product_list") */ -class AppCredentialProductListElement extends RenderElement { +class AppCredentialProductListElement extends RenderElementBase { /** * {@inheritdoc} diff --git a/src/Element/StatusPropertyElement.php b/src/Element/StatusPropertyElement.php index 2224d8e4..9acce1dd 100644 --- a/src/Element/StatusPropertyElement.php +++ b/src/Element/StatusPropertyElement.php @@ -19,14 +19,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElement; +use Drupal\Core\Render\Element\RenderElementBase; /** * Provides a status property element. * - * @RenderElement("status_property") + * @RenderElementBase("status_property") */ -class StatusPropertyElement extends RenderElement { +class StatusPropertyElement extends RenderElementBase { /** * Indicator status configuration id: OK. From f9a0f5f31a8f843597a7c3e7592764ffb622a24f Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 19 Jun 2024 22:40:35 +0530 Subject: [PATCH 4/7] Replace the deprecated constants of FileSystemInterface --- src/Entity/ListBuilder/AppListBuilder.php | 2 +- src/OauthTokenFileStorage.php | 3 ++- src/Plugin/KeyProvider/PrivateFileKeyProvider.php | 3 ++- tests/src/Kernel/OauthTokenFileStorageTest.php | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Entity/ListBuilder/AppListBuilder.php b/src/Entity/ListBuilder/AppListBuilder.php index c1263f6e..d41ae55e 100644 --- a/src/Entity/ListBuilder/AppListBuilder.php +++ b/src/Entity/ListBuilder/AppListBuilder.php @@ -290,7 +290,7 @@ protected function buildWarningRow(AppInterface $app, array &$rows) { $url = Url::fromUserInput($this->requestStack->getCurrentRequest()->getRequestUri(), $link_options); $link = Link::fromTextAndUrl($this->t('Show details'), $url); $build['warning-toggle'] = $link->toRenderable(); - $rows[$info_row_css_id]['data']['status']['data'] = $this->renderer->renderPlain($build); + $rows[$info_row_css_id]['data']['status']['data'] = $this->renderer->renderInIsolation($build); $row['data']['info'] = [ 'colspan' => count($this->buildHeader()), ]; diff --git a/src/OauthTokenFileStorage.php b/src/OauthTokenFileStorage.php index db808e13..3bfd2837 100644 --- a/src/OauthTokenFileStorage.php +++ b/src/OauthTokenFileStorage.php @@ -23,6 +23,7 @@ use Drupal\Component\Serialization\Json; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\File\Exception\FileException; +use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\Core\Logger\LoggerChannelInterface; @@ -172,7 +173,7 @@ public function saveToken(array $data): void { try { $this->checkRequirements(); // Write the obfuscated token data to a private file. - $this->fileSystem->saveData(base64_encode(Json::encode($data)), $this->tokenFilePath, FileSystemInterface::EXISTS_REPLACE); + $this->fileSystem->saveData(base64_encode(Json::encode($data)), $this->tokenFilePath, FileExists::Replace); } catch (FileException $e) { $this->logger->critical('Error saving OAuth token file.'); diff --git a/src/Plugin/KeyProvider/PrivateFileKeyProvider.php b/src/Plugin/KeyProvider/PrivateFileKeyProvider.php index 95c0be21..f149846f 100644 --- a/src/Plugin/KeyProvider/PrivateFileKeyProvider.php +++ b/src/Plugin/KeyProvider/PrivateFileKeyProvider.php @@ -21,6 +21,7 @@ use Drupal\apigee_edge\Exception\KeyProviderRequirementsException; use Drupal\Core\File\Exception\FileException; +use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Utility\Error; @@ -143,7 +144,7 @@ public function setKeyValue(KeyInterface $key, $key_value) { try { // Save the token data. return $this->getFileSystem() - ->saveData($key_value, $file_uri, FileSystemInterface::EXISTS_REPLACE); + ->saveData($key_value, $file_uri, FileExists::Replace); } catch (FileException $e) { return FALSE; diff --git a/tests/src/Kernel/OauthTokenFileStorageTest.php b/tests/src/Kernel/OauthTokenFileStorageTest.php index 5fd988ab..5a9e777a 100644 --- a/tests/src/Kernel/OauthTokenFileStorageTest.php +++ b/tests/src/Kernel/OauthTokenFileStorageTest.php @@ -23,6 +23,7 @@ use Drupal\apigee_edge\OauthTokenFileStorage; use Drupal\Component\Serialization\Json; use Drupal\Core\DependencyInjection\ContainerBuilder; +use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\KernelTests\KernelTestBase; @@ -183,7 +184,7 @@ public function testStaticCaching() { $stored_token['access_token'] = mb_strtolower($this->randomMachineName(32)); \Drupal::service('file_system')->saveData( base64_encode(Json::encode($stored_token)), - $this->tokenFileUri(), FileSystemInterface::EXISTS_REPLACE); + $this->tokenFileUri(), FileExists::Replace); // Make sure the cached version is still returned. $this->assertSame($access_token, $storage->getAccessToken()); From 7fe597996b9ab2f2721d86622d04ef30b0f4d6d1 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 19 Jun 2024 23:05:49 +0530 Subject: [PATCH 5/7] Mark the callback directly with a PHP attribute TrustedCallback --- src/Element/ApigeeEntityListElement.php | 2 ++ src/Element/StatusPropertyElement.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Element/ApigeeEntityListElement.php b/src/Element/ApigeeEntityListElement.php index 071d2465..29f7fb43 100644 --- a/src/Element/ApigeeEntityListElement.php +++ b/src/Element/ApigeeEntityListElement.php @@ -23,6 +23,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Render\Element\RenderElementBase; +use Drupal\Core\Security\Attribute\TrustedCallback; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -86,6 +87,7 @@ public function getInfo() { /** * Pre-render callback. */ + #[TrustedCallback] public function preRender($element) { $element['items'] = $this->entityTypeManager->getViewBuilder($element['#entity_type']->id()) ->viewMultiple($element['#entities'], $element['#view_mode']); diff --git a/src/Element/StatusPropertyElement.php b/src/Element/StatusPropertyElement.php index 9acce1dd..2297e138 100644 --- a/src/Element/StatusPropertyElement.php +++ b/src/Element/StatusPropertyElement.php @@ -20,6 +20,7 @@ namespace Drupal\apigee_edge\Element; use Drupal\Core\Render\Element\RenderElementBase; +use Drupal\Core\Security\Attribute\TrustedCallback; /** * Provides a status property element. @@ -73,6 +74,7 @@ public function getInfo() { * @return array * A renderable array. */ + #[TrustedCallback] public static function preRenderStatusProperty(array $element): array { $element['#attached']['library'][] = 'apigee_edge/apigee_edge.status_property'; return $element; From bfcfa678ba6b9eef8f29f4cb1fe438d1519b456e Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Mon, 24 Jun 2024 20:55:50 +0530 Subject: [PATCH 6/7] Removing deprecated changes --- modules/apigee_edge_teams/src/TeamPermissionHandler.php | 2 +- src/Element/ApigeeEntityListElement.php | 8 +++----- src/Element/ApigeeSecret.php | 6 +++--- src/Element/AppCredentialElement.php | 6 +++--- src/Element/AppCredentialProductListElement.php | 6 +++--- src/Element/StatusPropertyElement.php | 8 +++----- src/Entity/ListBuilder/AppListBuilder.php | 2 +- src/OauthTokenFileStorage.php | 3 +-- src/Plugin/KeyProvider/PrivateFileKeyProvider.php | 3 +-- tests/src/Kernel/OauthTokenFileStorageTest.php | 3 +-- 10 files changed, 20 insertions(+), 27 deletions(-) diff --git a/modules/apigee_edge_teams/src/TeamPermissionHandler.php b/modules/apigee_edge_teams/src/TeamPermissionHandler.php index 0c0f9d48..5ab2d36e 100644 --- a/modules/apigee_edge_teams/src/TeamPermissionHandler.php +++ b/modules/apigee_edge_teams/src/TeamPermissionHandler.php @@ -299,7 +299,7 @@ protected function sortPermissions(array $all_permissions = []) { protected function getModuleNames(): array { $modules = []; foreach (array_keys($this->moduleHandler->getModuleList()) as $module) { - $modules[$module] = \Drupal::service('extension.list.module')->getName($module); + $modules[$module] = $this->moduleHandler->getName($module); } asort($modules); return $modules; diff --git a/src/Element/ApigeeEntityListElement.php b/src/Element/ApigeeEntityListElement.php index 29f7fb43..14c476b5 100644 --- a/src/Element/ApigeeEntityListElement.php +++ b/src/Element/ApigeeEntityListElement.php @@ -22,16 +22,15 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Render\Element\RenderElementBase; -use Drupal\Core\Security\Attribute\TrustedCallback; +use Drupal\Core\Render\Element\RenderElement; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides an element for listing Apigee entities. * - * @RenderElementBase("apigee_entity_list") + * @RenderElement("apigee_entity_list") */ -class ApigeeEntityListElement extends RenderElementBase implements ContainerFactoryPluginInterface { +class ApigeeEntityListElement extends RenderElement implements ContainerFactoryPluginInterface { /** * The entity type manager. @@ -87,7 +86,6 @@ public function getInfo() { /** * Pre-render callback. */ - #[TrustedCallback] public function preRender($element) { $element['items'] = $this->entityTypeManager->getViewBuilder($element['#entity_type']->id()) ->viewMultiple($element['#entities'], $element['#view_mode']); diff --git a/src/Element/ApigeeSecret.php b/src/Element/ApigeeSecret.php index 5249b874..056609b5 100644 --- a/src/Element/ApigeeSecret.php +++ b/src/Element/ApigeeSecret.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElementBase; +use Drupal\Core\Render\Element\RenderElement; /** * Provides a secret element. * - * @RenderElementBase("apigee_secret") + * @RenderElement("apigee_secret") */ -class ApigeeSecret extends RenderElementBase { +class ApigeeSecret extends RenderElement { /** * {@inheritdoc} diff --git a/src/Element/AppCredentialElement.php b/src/Element/AppCredentialElement.php index 4363e5ec..8cbd7767 100644 --- a/src/Element/AppCredentialElement.php +++ b/src/Element/AppCredentialElement.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElementBase; +use Drupal\Core\Render\Element\RenderElement; /** * Provides an app credential element. * - * @RenderElementBase("app_credential") + * @RenderElement("app_credential") */ -class AppCredentialElement extends RenderElementBase { +class AppCredentialElement extends RenderElement { /** * {@inheritdoc} diff --git a/src/Element/AppCredentialProductListElement.php b/src/Element/AppCredentialProductListElement.php index 074e7538..e7badae0 100644 --- a/src/Element/AppCredentialProductListElement.php +++ b/src/Element/AppCredentialProductListElement.php @@ -20,14 +20,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElementBase; +use Drupal\Core\Render\Element\RenderElement; /** * Provides a product listing element for app credentials. * - * @RenderElementBase("app_credential_product_list") + * @RenderElement("app_credential_product_list") */ -class AppCredentialProductListElement extends RenderElementBase { +class AppCredentialProductListElement extends RenderElement { /** * {@inheritdoc} diff --git a/src/Element/StatusPropertyElement.php b/src/Element/StatusPropertyElement.php index 2297e138..2224d8e4 100644 --- a/src/Element/StatusPropertyElement.php +++ b/src/Element/StatusPropertyElement.php @@ -19,15 +19,14 @@ namespace Drupal\apigee_edge\Element; -use Drupal\Core\Render\Element\RenderElementBase; -use Drupal\Core\Security\Attribute\TrustedCallback; +use Drupal\Core\Render\Element\RenderElement; /** * Provides a status property element. * - * @RenderElementBase("status_property") + * @RenderElement("status_property") */ -class StatusPropertyElement extends RenderElementBase { +class StatusPropertyElement extends RenderElement { /** * Indicator status configuration id: OK. @@ -74,7 +73,6 @@ public function getInfo() { * @return array * A renderable array. */ - #[TrustedCallback] public static function preRenderStatusProperty(array $element): array { $element['#attached']['library'][] = 'apigee_edge/apigee_edge.status_property'; return $element; diff --git a/src/Entity/ListBuilder/AppListBuilder.php b/src/Entity/ListBuilder/AppListBuilder.php index d41ae55e..c1263f6e 100644 --- a/src/Entity/ListBuilder/AppListBuilder.php +++ b/src/Entity/ListBuilder/AppListBuilder.php @@ -290,7 +290,7 @@ protected function buildWarningRow(AppInterface $app, array &$rows) { $url = Url::fromUserInput($this->requestStack->getCurrentRequest()->getRequestUri(), $link_options); $link = Link::fromTextAndUrl($this->t('Show details'), $url); $build['warning-toggle'] = $link->toRenderable(); - $rows[$info_row_css_id]['data']['status']['data'] = $this->renderer->renderInIsolation($build); + $rows[$info_row_css_id]['data']['status']['data'] = $this->renderer->renderPlain($build); $row['data']['info'] = [ 'colspan' => count($this->buildHeader()), ]; diff --git a/src/OauthTokenFileStorage.php b/src/OauthTokenFileStorage.php index 3bfd2837..db808e13 100644 --- a/src/OauthTokenFileStorage.php +++ b/src/OauthTokenFileStorage.php @@ -23,7 +23,6 @@ use Drupal\Component\Serialization\Json; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\File\Exception\FileException; -use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\Core\Logger\LoggerChannelInterface; @@ -173,7 +172,7 @@ public function saveToken(array $data): void { try { $this->checkRequirements(); // Write the obfuscated token data to a private file. - $this->fileSystem->saveData(base64_encode(Json::encode($data)), $this->tokenFilePath, FileExists::Replace); + $this->fileSystem->saveData(base64_encode(Json::encode($data)), $this->tokenFilePath, FileSystemInterface::EXISTS_REPLACE); } catch (FileException $e) { $this->logger->critical('Error saving OAuth token file.'); diff --git a/src/Plugin/KeyProvider/PrivateFileKeyProvider.php b/src/Plugin/KeyProvider/PrivateFileKeyProvider.php index f149846f..95c0be21 100644 --- a/src/Plugin/KeyProvider/PrivateFileKeyProvider.php +++ b/src/Plugin/KeyProvider/PrivateFileKeyProvider.php @@ -21,7 +21,6 @@ use Drupal\apigee_edge\Exception\KeyProviderRequirementsException; use Drupal\Core\File\Exception\FileException; -use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Utility\Error; @@ -144,7 +143,7 @@ public function setKeyValue(KeyInterface $key, $key_value) { try { // Save the token data. return $this->getFileSystem() - ->saveData($key_value, $file_uri, FileExists::Replace); + ->saveData($key_value, $file_uri, FileSystemInterface::EXISTS_REPLACE); } catch (FileException $e) { return FALSE; diff --git a/tests/src/Kernel/OauthTokenFileStorageTest.php b/tests/src/Kernel/OauthTokenFileStorageTest.php index 5a9e777a..5fd988ab 100644 --- a/tests/src/Kernel/OauthTokenFileStorageTest.php +++ b/tests/src/Kernel/OauthTokenFileStorageTest.php @@ -23,7 +23,6 @@ use Drupal\apigee_edge\OauthTokenFileStorage; use Drupal\Component\Serialization\Json; use Drupal\Core\DependencyInjection\ContainerBuilder; -use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\KernelTests\KernelTestBase; @@ -184,7 +183,7 @@ public function testStaticCaching() { $stored_token['access_token'] = mb_strtolower($this->randomMachineName(32)); \Drupal::service('file_system')->saveData( base64_encode(Json::encode($stored_token)), - $this->tokenFileUri(), FileExists::Replace); + $this->tokenFileUri(), FileSystemInterface::EXISTS_REPLACE); // Make sure the cached version is still returned. $this->assertSame($access_token, $storage->getAccessToken()); From 042892c193e77e4d93a4eeeb3324cacea49157ac Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Mon, 24 Jun 2024 21:01:37 +0530 Subject: [PATCH 7/7] Removed 10.3 check --- .github/workflows/php.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index fdbcbad4..5348422f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -38,7 +38,6 @@ jobs: drupal-core: # Should update the following as the minimum supported version from Drupal.org - "10.2.x" - - "10.3.x" instance-type: - "Edge" - "X"