From bf4e48d389efcbc2efcf849893c1c3775577a90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Thu, 27 Feb 2020 15:24:02 +0100 Subject: [PATCH] Issue #3098489 by catch, lauriii, DamienMcKenna, zrpnr, longwave, bnjmnm: Remove deprecated jQuery UI library definitions --- core/core.libraries.yml | 40 ++++----------- .../Core/Asset/LegacyLibraryDiscoveryTest.php | 50 ------------------- .../Listeners/DeprecationListenerTrait.php | 2 - 3 files changed, 10 insertions(+), 82 deletions(-) delete mode 100644 core/tests/Drupal/KernelTests/Core/Asset/LegacyLibraryDiscoveryTest.php diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 4115f603e1e..16dec8d2450 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -469,56 +469,36 @@ jquery.ui.button: version: *jquery_ui_version license: *jquery_ui_license js: + assets/vendor/jquery.ui/ui/widgets/checkboxradio-min.js: { minified: true } + assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js: { minified: true } assets/vendor/jquery.ui/ui/widgets/button-min.js: { minified: true } - css: - component: - assets/vendor/jquery.ui/themes/base/button.css: {} - dependencies: - - core/jquery.ui - - core/jquery.ui.widget - - core/jquery.ui.checkboxradio - - core/jquery.ui.controlgroup - -jquery.ui.checkboxradio: - version: *jquery_ui_version - license: *jquery_ui_license - js: - assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { minified: true } - assets/vendor/jquery.ui/ui/widgets/checkboxradio-min.js: { minified: true } css: component: assets/vendor/jquery.ui/themes/base/checkboxradio.css: {} + assets/vendor/jquery.ui/themes/base/controlgroup.css: {} assets/vendor/jquery.ui/themes/base/button.css: {} dependencies: - core/jquery.ui - core/jquery.ui.widget - deprecated: &jquery_ui_unused_deprecated The "%library_id%" asset library is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/3067969 - -jquery.ui.controlgroup: - version: *jquery_ui_version - license: *jquery_ui_license - js: - assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js: { minified: true } - css: - component: - assets/vendor/jquery.ui/themes/base/controlgroup.css: {} - dependencies: - - core/jquery.ui - - core/jquery.ui.widget - deprecated: *jquery_ui_unused_deprecated jquery.ui.dialog: version: *jquery_ui_version license: *jquery_ui_license js: + assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { minified: true } + assets/vendor/jquery.ui/ui/widgets/checkboxradio-min.js: { minified: true } + assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js: { minified: true } + assets/vendor/jquery.ui/ui/widgets/button-min.js: { minified: true } assets/vendor/jquery.ui/ui/widgets/dialog-min.js: { minified: true } css: component: + assets/vendor/jquery.ui/themes/base/checkboxradio.css: {} + assets/vendor/jquery.ui/themes/base/controlgroup.css: {} + assets/vendor/jquery.ui/themes/base/button.css: {} assets/vendor/jquery.ui/themes/base/dialog.css: {} dependencies: - core/jquery.ui - core/jquery.ui.widget - - core/jquery.ui.button - core/jquery.ui.draggable - core/jquery.ui.mouse - core/jquery.ui.position diff --git a/core/tests/Drupal/KernelTests/Core/Asset/LegacyLibraryDiscoveryTest.php b/core/tests/Drupal/KernelTests/Core/Asset/LegacyLibraryDiscoveryTest.php deleted file mode 100644 index ae7d785ffd4..00000000000 --- a/core/tests/Drupal/KernelTests/Core/Asset/LegacyLibraryDiscoveryTest.php +++ /dev/null @@ -1,50 +0,0 @@ -libraryDiscovery = $this->container->get('library.discovery'); - } - - /** - * Tests that the jquery.ui.checkboxradio library is deprecated. - * - * @expectedDeprecation The "core/jquery.ui.checkboxradio" asset library is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/3067969 - * @doesNotPerformAssertions - */ - public function testJqueryUiCheckboxradio() { - $this->libraryDiscovery->getLibraryByName('core', 'jquery.ui.checkboxradio'); - } - - /** - * Tests that the jquery.ui.controlgroup library is deprecated. - * - * @expectedDeprecation The "core/jquery.ui.controlgroup" asset library is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/3067969 - * @doesNotPerformAssertions - */ - public function testJqueryUiControlgroup() { - $this->libraryDiscovery->getLibraryByName('core', 'jquery.ui.controlgroup'); - } - -} diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php index 651c94ef67a..21ee482fa18 100644 --- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php +++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php @@ -174,8 +174,6 @@ trait DeprecationListenerTrait { 'The "Symfony\Component\Process\Process::inheritEnvironmentVariables()" method is deprecated since Symfony 4.4, env variables are always inherited.', 'The "Symfony\Component\Debug\BufferingLogger" class is deprecated since Symfony 4.4, use "Symfony\Component\ErrorHandler\BufferingLogger" instead.', 'Using the "Symfony\Component\Validator\Constraints\Length" constraint with the "min" option without setting the "allowEmptyString" one is deprecated and defaults to true. In 5.0, it will become optional and default to false.', - 'The "core/jquery.ui.checkboxradio" asset library is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/3067969', - 'The "core/jquery.ui.controlgroup" asset library is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/3067969', // The following deprecation is listed for Twig 2 compatibility when unit // testing using \Symfony\Component\ErrorHandler\DebugClassLoader. 'The "Twig\Environment::getTemplateClass()" method is considered internal. It may change without further notice. You should not extend it from "Drupal\Core\Template\TwigEnvironment".',