From fdc815d0050057125fce6cd42e0de207a7a611c3 Mon Sep 17 00:00:00 2001 From: divyajose Date: Wed, 22 Nov 2023 11:58:12 +0530 Subject: [PATCH 1/5] Deprecated classes that is dependent on drupal/console --- src/Command/CommandBase.php | 6 ++++++ src/Command/CreateEdgeRoleCommand.php | 4 ++++ src/Command/DeveloperSyncCommand.php | 4 ++++ src/Command/DrupalConsoleLog.php | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php index a7519c9e..cf9b488e 100644 --- a/src/Command/CommandBase.php +++ b/src/Command/CommandBase.php @@ -19,6 +19,8 @@ namespace Drupal\apigee_edge\Command; +@trigger_error('The ' . __NAMESPACE__ . '\CommandBase is deprecated in 3.0.4 and will be removed. See https://github.com/apigee/apigee-edge-drupal/issues/984', E_USER_DEPRECATED); + use Drupal\apigee_edge\CliServiceInterface; use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Command\Shared\CommandTrait; @@ -32,6 +34,10 @@ /** * Class CommandBase for shared functionality. + * + * @deprecated in 3.0.4 and will be removed. + * + * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ abstract class CommandBase extends Command { diff --git a/src/Command/CreateEdgeRoleCommand.php b/src/Command/CreateEdgeRoleCommand.php index 8217682d..c0b72a47 100644 --- a/src/Command/CreateEdgeRoleCommand.php +++ b/src/Command/CreateEdgeRoleCommand.php @@ -31,6 +31,10 @@ * extension="apigee_edge", * extensionType="module" * ) + * + * @deprecated in 3.0.3 and will be removed. + * + * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ class CreateEdgeRoleCommand extends CommandBase { diff --git a/src/Command/DeveloperSyncCommand.php b/src/Command/DeveloperSyncCommand.php index 557f9940..6a842abc 100644 --- a/src/Command/DeveloperSyncCommand.php +++ b/src/Command/DeveloperSyncCommand.php @@ -29,6 +29,10 @@ * extension="apigee_edge", * extensionType="module" * ) + * + * @deprecated in 3.0.3 and will be removed. + * + * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ class DeveloperSyncCommand extends CommandBase { diff --git a/src/Command/DrupalConsoleLog.php b/src/Command/DrupalConsoleLog.php index fac7fbf3..cac2066a 100644 --- a/src/Command/DrupalConsoleLog.php +++ b/src/Command/DrupalConsoleLog.php @@ -27,6 +27,10 @@ /** * Redirects Drupal logging messages to Drupal Console log. + * + * @deprecated in 3.0.3 and will be removed. + * + * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ class DrupalConsoleLog implements LoggerInterface { From aca8444d4e1732e053940b665229bc0c3b177b77 Mon Sep 17 00:00:00 2001 From: divyajose Date: Wed, 22 Nov 2023 12:03:17 +0530 Subject: [PATCH 2/5] ignore these files as they contain deprecated class --- src/Command/CreateEdgeRoleCommand.php | 2 ++ src/Command/DeveloperSyncCommand.php | 2 ++ tests/src/Unit/Command/CreateEdgeRoleCommandTest.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Command/CreateEdgeRoleCommand.php b/src/Command/CreateEdgeRoleCommand.php index c0b72a47..13810a43 100644 --- a/src/Command/CreateEdgeRoleCommand.php +++ b/src/Command/CreateEdgeRoleCommand.php @@ -35,6 +35,8 @@ * @deprecated in 3.0.3 and will be removed. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 + * + * @phpstan-ignore-next-line */ class CreateEdgeRoleCommand extends CommandBase { diff --git a/src/Command/DeveloperSyncCommand.php b/src/Command/DeveloperSyncCommand.php index 6a842abc..09be879e 100644 --- a/src/Command/DeveloperSyncCommand.php +++ b/src/Command/DeveloperSyncCommand.php @@ -33,6 +33,8 @@ * @deprecated in 3.0.3 and will be removed. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 + * + * @phpstan-ignore-next-line */ class DeveloperSyncCommand extends CommandBase { diff --git a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php index ede0d4f9..8408ce80 100644 --- a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php +++ b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php @@ -35,6 +35,8 @@ * Test ApigeeEdgeCommands class. * * @group apigee_edge + * + * @phpstan-ignore-next-line */ class CreateEdgeRoleCommandTest extends UnitTestCase { From 7ec1078a326bbbc1597b16e711fefc6f37d629a7 Mon Sep 17 00:00:00 2001 From: divyajose Date: Wed, 22 Nov 2023 12:03:17 +0530 Subject: [PATCH 3/5] ignore these files as they contain deprecated class --- tests/src/Unit/Command/CreateEdgeRoleCommandTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php index 8408ce80..996913a0 100644 --- a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php +++ b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php @@ -36,7 +36,7 @@ * * @group apigee_edge * - * @phpstan-ignore-next-line + * @group legacy */ class CreateEdgeRoleCommandTest extends UnitTestCase { From 0da900903190ca91d225831f8b6b9eccf8f91e71 Mon Sep 17 00:00:00 2001 From: divyajose Date: Wed, 22 Nov 2023 12:03:17 +0530 Subject: [PATCH 4/5] ignore these files as they contain deprecated class --- src/Command/CommandBase.php | 7 ++++--- src/Command/CreateEdgeRoleCommand.php | 6 +++--- src/Command/DeveloperSyncCommand.php | 6 +++--- src/Command/DrupalConsoleLog.php | 5 +++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php index cf9b488e..941d56da 100644 --- a/src/Command/CommandBase.php +++ b/src/Command/CommandBase.php @@ -19,7 +19,7 @@ namespace Drupal\apigee_edge\Command; -@trigger_error('The ' . __NAMESPACE__ . '\CommandBase is deprecated in 3.0.4 and will be removed. See https://github.com/apigee/apigee-edge-drupal/issues/984', E_USER_DEPRECATED); +@trigger_error('The ' . __NAMESPACE__ . '\CommandBase is deprecated in apigee_edge:3.0.4 and is removed from apigee_edge:3.1.0. Drupal/console is not compatible with Drupal 10. See https://github.com/apigee/apigee-edge-drupal/issues/984', E_USER_DEPRECATED); use Drupal\apigee_edge\CliServiceInterface; use Drupal\Console\Core\Command\Command; @@ -34,8 +34,9 @@ /** * Class CommandBase for shared functionality. - * - * @deprecated in 3.0.4 and will be removed. + * + * @deprecated in apigee_edge:3.0.4 and is removed from apigee_edge:3.1.0. + * Drupal/console is not compatible with Drupal 10. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ diff --git a/src/Command/CreateEdgeRoleCommand.php b/src/Command/CreateEdgeRoleCommand.php index 13810a43..0e74c35c 100644 --- a/src/Command/CreateEdgeRoleCommand.php +++ b/src/Command/CreateEdgeRoleCommand.php @@ -31,11 +31,11 @@ * extension="apigee_edge", * extensionType="module" * ) - * - * @deprecated in 3.0.3 and will be removed. + * + * @deprecated in apigee_edge:3.0.4 and is removed from apigee_edge:3.1.0. + * Drupal/console is not compatible with Drupal 10. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 - * * @phpstan-ignore-next-line */ class CreateEdgeRoleCommand extends CommandBase { diff --git a/src/Command/DeveloperSyncCommand.php b/src/Command/DeveloperSyncCommand.php index 09be879e..c07a3bf3 100644 --- a/src/Command/DeveloperSyncCommand.php +++ b/src/Command/DeveloperSyncCommand.php @@ -29,11 +29,11 @@ * extension="apigee_edge", * extensionType="module" * ) - * - * @deprecated in 3.0.3 and will be removed. + * + * @deprecated in apigee_edge:3.0.4 and is removed from apigee_edge:3.1.0. + * Drupal/console is not compatible with Drupal 10. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 - * * @phpstan-ignore-next-line */ class DeveloperSyncCommand extends CommandBase { diff --git a/src/Command/DrupalConsoleLog.php b/src/Command/DrupalConsoleLog.php index cac2066a..ea4322fe 100644 --- a/src/Command/DrupalConsoleLog.php +++ b/src/Command/DrupalConsoleLog.php @@ -27,8 +27,9 @@ /** * Redirects Drupal logging messages to Drupal Console log. - * - * @deprecated in 3.0.3 and will be removed. + * + * @deprecated in apigee_edge:3.0.4 and is removed from apigee_edge:3.1.0. + * Drupal/console is not compatible with Drupal 10. * * @see https://github.com/apigee/apigee-edge-drupal/issues/984 */ From 3e4c0048e0bcf6dab9a2653fb94876d64f2655d7 Mon Sep 17 00:00:00 2001 From: divyajose Date: Wed, 22 Nov 2023 12:03:17 +0530 Subject: [PATCH 5/5] ignore these files as they contain deprecated class --- tests/src/Unit/Command/CreateEdgeRoleCommandTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php index 996913a0..8ffd42b8 100644 --- a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php +++ b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php @@ -35,7 +35,7 @@ * Test ApigeeEdgeCommands class. * * @group apigee_edge - * + * * @group legacy */ class CreateEdgeRoleCommandTest extends UnitTestCase {