From 0c7455204ad79d76cbe7c8e41e404ffa26890e10 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Sun, 22 Jun 2025 13:38:30 +0200 Subject: [PATCH 1/5] Also test modules in subdirectories. --- phpunit.xml.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bfd5ca370..7ad9fc8e4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -59,15 +59,19 @@ ./modules/*/tests/src/Unit + ./modules/*/modules/*/tests/src/Unit ./modules/*/tests/src/Kernel + ./modules/*/modules/*/tests/src/Kernel ./modules/*/tests/src/Functional + ./modules/*/modules/*/tests/src/Functional ./modules/*/tests/src/FunctionalJavascript + ./modules/*/modules/*/tests/src/FunctionalJavascript From 8462254211c301fc5f20acb94348b28db93aac70 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Sun, 22 Jun 2025 16:40:14 +0200 Subject: [PATCH 2/5] New fixture for test export diff. --- .../ExportedArrayDifferTest/assoc.hello.yml | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml diff --git a/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml b/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml new file mode 100644 index 000000000..c43b029c8 --- /dev/null +++ b/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml @@ -0,0 +1,50 @@ +before: + hello: hello + 'good day': 'good day' + remove: remove + assoc_diff: + a: A + b: B + assoc_replace: + r: R + assoc_keep: + b: B + assoc_drop: + x: X + internet: internet + goodbye: goodbye +after: + assoc_replace: + rr: RR + assoc_diff: + a: A + b: BB + hello: salut + goodbye: 'a bientot' + assoc_keep: + b: B + assoc_new: + new: New + ajouter: ajouter + 'good day': bonjour + internet: internet +diff: + '-- assoc_drop': + x: X + '-- remove': remove + '~~ assoc_diff': + '~- b': B + '~+ b': BB + '~- assoc_replace': + r: R + '~+ assoc_replace': + rr: RR + '~- good day': 'good day' + '~+ good day': bonjour + '~- goodbye': goodbye + '~+ goodbye': 'a bientot' + '~- hello': hello + '~+ hello': salut + '++ ajouter': ajouter + '++ assoc_new': + new: New From d2dbbc7b0d1522e84af78157129e536da05831ac Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Sun, 22 Jun 2025 13:15:27 +0200 Subject: [PATCH 3/5] Use TaggedValue for changes in recorded diff yml. --- ...oller_attributes.container.definitions.yml | 2 +- ...ontroller_attributes_test.links.action.yml | 4 +- .../controller_attributes_test.links.menu.yml | 12 ++-- .../controller_attributes_test.links.task.yml | 8 +-- .../controller_attributes_test.routes.yml | 28 ++++----- .../ock_preset.container.definitions.yml | 16 ++--- .../ock_preset.links.action.yml | 2 +- .../ock_preset.links.menu.yml | 2 +- .../ock_preset.links.task.yml | 8 +-- .../ock_preset.routes.yml | 10 ++-- .../ock.container.definitions.yml | 42 ++++++------- .../Kernel/OckSnapshotTest/ock.links.menu.yml | 6 +- .../Kernel/OckSnapshotTest/ock.links.task.yml | 14 ++--- .../Kernel/OckSnapshotTest/ock.routes.yml | 20 +++---- .../ock_example.container.definitions.yml | 14 ++--- .../renderkit.container.definitions.yml | 60 +++++++++---------- .../renderkit.links.menu.yml | 4 +- .../renderkit.routes.yml | 4 +- .../service_discovery.container.aliases.yml | 2 +- ...ervice_discovery.container.definitions.yml | 2 +- ...e_discovery_test.container.definitions.yml | 2 +- .../testing/src/Diff/ExportedArrayDiffer.php | 20 +++---- .../ExportedArrayDifferTest/assoc.hello.yml | 26 ++++---- .../list.change-assoc-value.yml | 5 +- .../ExportedArrayDifferTest/list.hello.yml | 2 +- 25 files changed, 153 insertions(+), 162 deletions(-) diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml index bb70beb0a..a56af3a47 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml @@ -1,6 +1,6 @@ module: controller_attributes type: container.definitions -'++ Drupal\controller_attributes\Hook\LinksFromRoutes': +Drupal\controller_attributes\Hook\LinksFromRoutes: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@router.route_provider' diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml index 785b5ff4e..797be21ca 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml @@ -1,10 +1,10 @@ module: controller_attributes_test type: links.action -'++ controller_attributes_test.hello_user_overview.add': +controller_attributes_test.hello_user_overview.add: !add title: 'Add user' appears_on: - controller_attributes_test.hello_user_overview.overview -'++ controller_attributes_test.hello_user_overview.invite': +controller_attributes_test.hello_user_overview.invite: !add title: 'Invite user' weight: 10 appears_on: diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml index 371506047..424f3866d 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml @@ -1,23 +1,23 @@ module: controller_attributes_test type: links.menu -'++ controller_attributes_test.hello.goodbye': +controller_attributes_test.hello.goodbye: !add menu_name: tools title: Goodbye description: 'A farewell greeting' -'++ controller_attributes_test.hello.hello': +controller_attributes_test.hello.hello: !add menu_name: tools title: null -'++ controller_attributes_test.hello_user_overview.overview': +controller_attributes_test.hello_user_overview.overview: !add menu_name: tools title: 'List of users' -'++ controller_attributes_test.parent_child.automatic_child': +controller_attributes_test.parent_child.automatic_child: !add menu_name: tools title: Parent parent: controller_attributes_test.parent_child.parent -'++ controller_attributes_test.parent_child.explicit_child': +controller_attributes_test.parent_child.explicit_child: !add menu_name: tools title: Parent parent: controller_attributes_test.parent_child.parent -'++ controller_attributes_test.parent_child.parent': +controller_attributes_test.parent_child.parent: !add menu_name: tools title: Parent diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml index 55477d327..e4f9926f7 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml @@ -1,14 +1,14 @@ module: controller_attributes_test type: links.task -'++ controller_attributes_test.hello_user.delete_user_different_base_route': +controller_attributes_test.hello_user.delete_user_different_base_route: !add title: Edit base_route: entity.user.canonical -'++ controller_attributes_test.hello_user.edit': +controller_attributes_test.hello_user.edit: !add title: Edit base_route: controller_attributes_test.hello_user.view -'++ controller_attributes_test.hello_user.invite': +controller_attributes_test.hello_user.invite: !add title: Invite base_route: controller_attributes_test.hello_user.view -'++ controller_attributes_test.hello_user.view': +controller_attributes_test.hello_user.view: !add title: View base_route: controller_attributes_test.hello_user.view diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml index 505c0450c..b8444f4c3 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml @@ -1,6 +1,6 @@ module: controller_attributes_test type: routes -'++ /controller-attributes-test/goodbye': +/controller-attributes-test/goodbye: !add controller_attributes_test.hello.goodbye: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloController::goodbye' @@ -8,13 +8,13 @@ type: routes _menu_link: title: Goodbye description: 'A farewell greeting' -'++ /controller-attributes-test/hello': +/controller-attributes-test/hello: !add controller_attributes_test.hello.hello: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloController::hello' options: _menu_link: { } -'++ /controller-attributes-test/post-or-put/{arg}': +'/controller-attributes-test/post-or-put/{arg}': !add controller_attributes_test.hello.post_or_put: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloController::postOrPut' @@ -31,14 +31,14 @@ type: routes arg: type: 'entity:user' converter: paramconverter.entity -'++ /controller-attributes-test/subdir/hello-in-subdir': +/controller-attributes-test/subdir/hello-in-subdir: !add controller_attributes_test.subdir.controller_in_subdir.hello: defaults: _controller: 'Drupal\controller_attributes_test\Controller\Subdir\ControllerInSubdir::hello' options: compiler_class: null utf8: null -'++ /explicit-child': +/explicit-child: !add controller_attributes_test.parent_child.explicit_child: defaults: _controller: 'Drupal\controller_attributes_test\Controller\ParentChildController::explicitChild' @@ -46,7 +46,7 @@ type: routes _menu_link: title: Parent parent: controller_attributes_test.parent_child.parent -'++ /hello/user': +/hello/user: !add controller_attributes_test.hello_user_overview.overview: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserOverviewController::overview' @@ -58,7 +58,7 @@ type: routes title: 'List of users' _access_checks: - access_check.permission -'++ /hello/user/add-user': +/hello/user/add-user: !add controller_attributes_test.hello_user_overview.add: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserOverviewController::add' @@ -72,7 +72,7 @@ type: routes - controller_attributes_test.hello_user_overview.overview _access_checks: - access_check.permission -'++ /hello/user/invite-user': +/hello/user/invite-user: !add controller_attributes_test.hello_user_overview.invite: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserOverviewController::invite' @@ -87,7 +87,7 @@ type: routes weight: 10 _access_checks: - access_check.permission -'++ /hello/user/{user}': +'/hello/user/{user}': !add controller_attributes_test.hello_user.view: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserController::view' @@ -103,7 +103,7 @@ type: routes converter: paramconverter.entity _access_checks: - access_check.default -'++ /hello/user/{user}/delete-different-base-route': +'/hello/user/{user}/delete-different-base-route': !add controller_attributes_test.hello_user.delete_user_different_base_route: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserController::deleteUserDifferentBaseRoute' @@ -119,7 +119,7 @@ type: routes converter: paramconverter.entity _access_checks: - access_check.default -'++ /hello/user/{user}/edit': +'/hello/user/{user}/edit': !add controller_attributes_test.hello_user.edit: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserController::edit' @@ -136,7 +136,7 @@ type: routes converter: paramconverter.entity _access_checks: - access_check.default -'++ /hello/user/{user}/invite': +'/hello/user/{user}/invite': !add controller_attributes_test.hello_user.invite: defaults: _controller: 'Drupal\controller_attributes_test\Controller\HelloUserController::invite' @@ -152,14 +152,14 @@ type: routes converter: paramconverter.entity _access_checks: - access_check.default -'++ /parent': +/parent: !add controller_attributes_test.parent_child.parent: defaults: _controller: 'Drupal\controller_attributes_test\Controller\ParentChildController::parent' options: _menu_link: title: Parent -'++ /parent/auto-child': +/parent/auto-child: !add controller_attributes_test.parent_child.automatic_child: defaults: _controller: 'Drupal\controller_attributes_test\Controller\ParentChildController::automaticChild' diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml index 98c63de51..6d4b13815 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml @@ -1,27 +1,27 @@ module: ock_preset type: container.definitions -'~~ Ock\Ock\Plugin\Registry\PluginRegistryInterface': +Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistryInterface getFactory(): - Ock\Ock\Plugin\Registry\PluginRegistry - fromCandidateObjects - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument - '~~ getValues()': + getValues(): !diff - !add '@Drupal\ock_preset\FactsIA\FactsIA_PresetPluginDeclarations' -'++ Drupal\ock_preset\Crud\PresetRepository': +Drupal\ock_preset\Crud\PresetRepository: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@config.factory' getClass(): Drupal\ock_preset\Crud\PresetRepository isPublic(): true -'++ Drupal\ock_preset\FactsIA\FactsIA_PresetPluginDeclarations': +Drupal\ock_preset\FactsIA\FactsIA_PresetPluginDeclarations: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml index 4265f05db..6542939a8 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml @@ -1,6 +1,6 @@ module: ock_preset type: links.action -'++ ock_preset.iface_presets.add': +ock_preset.iface_presets.add: !add title: 'Add preset' appears_on: - ock_preset.iface_presets.index diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml index 2b758a454..62e76a4cc 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml @@ -1,6 +1,6 @@ module: ock_preset type: links.menu -'++ ock_preset.all_presets_overview.index': +ock_preset.all_presets_overview.index: !add menu_name: tools title: 'ock_preset presets' parent: system.admin_structure diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml index 5d1dcfe42..4e1df2374 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml @@ -1,14 +1,14 @@ module: ock_preset type: links.task -'++ ock_preset.iface_presets.add': +ock_preset.iface_presets.add: !add title: 'Add preset' base_route: ock_preset.iface_presets.index -'++ ock_preset.iface_presets.index': +ock_preset.iface_presets.index: !add title: List base_route: ock_preset.iface_presets.index -'++ ock_preset.preset.delete': +ock_preset.preset.delete: !add title: Delete base_route: ock_preset.preset.edit -'++ ock_preset.preset.edit': +ock_preset.preset.edit: !add title: Edit base_route: ock_preset.preset.edit diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml index fc042f209..d6c64b76c 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml @@ -1,6 +1,6 @@ module: ock_preset type: routes -'++ /admin/structure/ock_preset': +/admin/structure/ock_preset: !add ock_preset.all_presets_overview.index: defaults: _controller: 'Drupal\ock_preset\Controller\Controller_AllPresetsOverview::index' @@ -12,7 +12,7 @@ type: routes _menu_link: { } _access_checks: - access_check.permission -'++ /admin/structure/ock_preset/{interface}': +'/admin/structure/ock_preset/{interface}': !add ock_preset.iface_presets.index: defaults: _title_callback: 'Drupal\ock_preset\Controller\Controller_IfacePresets::title' @@ -29,7 +29,7 @@ type: routes title: List _access_checks: - access_check.permission -'++ /admin/structure/ock_preset/{interface}/add': +'/admin/structure/ock_preset/{interface}/add': !add ock_preset.iface_presets.add: defaults: _title_callback: 'Drupal\ock_preset\Controller\Controller_IfacePresets::title' @@ -48,7 +48,7 @@ type: routes title: 'Add preset' _access_checks: - access_check.permission -'++ /admin/structure/ock_preset/{interface}/preset/{preset_name}': +'/admin/structure/ock_preset/{interface}/preset/{preset_name}': !add ock_preset.preset.edit: defaults: _title_callback: 'Drupal\ock_preset\Controller\Controller_Preset::title' @@ -65,7 +65,7 @@ type: routes title: Edit _access_checks: - access_check.permission -'++ /admin/structure/ock_preset/{interface}/preset/{preset_name}/delete': +'/admin/structure/ock_preset/{interface}/preset/{preset_name}/delete': !add ock_preset.preset.delete: defaults: _title_callback: 'Drupal\ock_preset\Controller\Controller_Preset::title' diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml index deb3d4dce..8032f6fa3 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml @@ -1,9 +1,9 @@ module: ock type: container.definitions -'~~ paramconverter_manager': +paramconverter_manager: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Drupal\Core\ParamConverter\ParamConverterManager - '~~ getMethodCalls()': + getMethodCalls(): !diff - !add - addConverter - @@ -33,26 +33,26 @@ type: container.definitions paramconverter: - { } - Drupal\ock\UI\ParamConverter\ParamConverter_Plugin -'++ Drupal\ock\Formula\Formula_PermissionId': +Drupal\ock\Formula\Formula_PermissionId: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@user.permissions' - '@module_handler' getClass(): Drupal\ock\Formula\Formula_PermissionId isPublic(): true -'++ Drupal\ock\OckModuleNamespace': +Drupal\ock\OckModuleNamespace: !add class: Symfony\Component\DependencyInjection\Definition getClass(): Drupal\ock\OckModuleNamespace getTags(): adaptism.discovery: - { } -'++ Drupal\ock\TextToDrupal\TextToDrupalInterface': +Drupal\ock\TextToDrupal\TextToDrupalInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@Ock\Ock\Translator\TranslatorInterface' getClass(): Drupal\ock\TextToDrupal\TextToDrupal_Default isPublic(): true -'++ Ock\Adaptism\AdapterDefinitionList\AdapterDefinitionListInterface': +Ock\Adaptism\AdapterDefinitionList\AdapterDefinitionListInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -68,7 +68,7 @@ type: container.definitions - Ock\Adaptism\AdapterDefinitionList\AdapterDefinitionList - fromCandidateObjects isPublic(): true -'++ Ock\Adaptism\Inspector\FactoryInspector_AdapterAttribute': +Ock\Adaptism\Inspector\FactoryInspector_AdapterAttribute: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -81,7 +81,7 @@ type: container.definitions getTags(): adaptism.discovery: - { } -'++ Ock\Adaptism\Inspector\FactoryInspector_SelfAdapterAttribute': +Ock\Adaptism\Inspector\FactoryInspector_SelfAdapterAttribute: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@Ock\Egg\ParamToEgg\ParamToEggInterface' @@ -89,7 +89,7 @@ type: container.definitions getTags(): adaptism.discovery: - { } -'++ Ock\Adaptism\UniversalAdapter\UniversalAdapterInterface': +Ock\Adaptism\UniversalAdapter\UniversalAdapterInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -106,7 +106,7 @@ type: container.definitions getClass(): Ock\Adaptism\SpecificAdapter\SpecificAdapter_DispatchByType getClass(): Ock\Adaptism\UniversalAdapter\UniversalAdapter isPublic(): true -'++ Ock\Egg\ParamToEgg\ParamToEggInterface': +Ock\Egg\ParamToEgg\ParamToEggInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -116,7 +116,7 @@ type: container.definitions - '@Ock\Egg\ParamToEgg\ParamToEgg_ParamTypeAsServiceId' getClass(): Ock\Egg\ParamToEgg\ParamToEgg_Chain isPublic(): true -'++ Ock\Egg\ParamToEgg\ParamToEgg_ParamTypeAsServiceId': +Ock\Egg\ParamToEgg\ParamToEgg_ParamTypeAsServiceId: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@service_container' @@ -124,7 +124,7 @@ type: container.definitions getTags(): Ock\Egg\ParamToEgg\ParamToEggInterface: - { } -'++ Ock\Ock\Inspector\FactoryInspector_ModifierDecorator::createDecoratorCallback()': +'Ock\Ock\Inspector\FactoryInspector_ModifierDecorator::createDecoratorCallback()': !add class: Symfony\Component\DependencyInjection\Definition getClass(): Closure getFactory(): @@ -134,13 +134,13 @@ type: container.definitions ock.discovery: - { } isPublic(): true -'++ Ock\Ock\Inspector\FactoryInspector_OckFormulaAttribute': +Ock\Ock\Inspector\FactoryInspector_OckFormulaAttribute: !add class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Inspector\FactoryInspector_OckFormulaAttribute getTags(): ock.discovery: - { } -'++ Ock\Ock\Inspector\FactoryInspector_OckInstanceAttribute': +Ock\Ock\Inspector\FactoryInspector_OckInstanceAttribute: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@service_container' @@ -148,13 +148,13 @@ type: container.definitions getTags(): ock.discovery: - { } -'++ Ock\Ock\OckNamespace': +Ock\Ock\OckNamespace: !add class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\OckNamespace getTags(): adaptism.discovery: - { } -'++ Ock\Ock\Plugin\GroupLabels\PluginGroupLabelsInterface': +Ock\Ock\Plugin\GroupLabels\PluginGroupLabelsInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@extension.list.module' @@ -163,7 +163,7 @@ type: container.definitions - Drupal\ock\OckServiceFactories - pluginGroupLabels isPublic(): true -'++ Ock\Ock\Plugin\Map\PluginMapInterface': +Ock\Ock\Plugin\Map\PluginMapInterface: !add class: Symfony\Component\DependencyInjection\Definition $innerServiceId: Ock\Ock\Plugin\Map\PluginMap_Buffer.inner $decorationOnInvalid: 1 @@ -171,13 +171,13 @@ type: container.definitions - '@Ock\Ock\Plugin\Map\PluginMap_Buffer.inner' getClass(): Ock\Ock\Plugin\Map\PluginMap_Buffer isPublic(): true -'++ Ock\Ock\Plugin\Map\PluginMap_Buffer.inner': +Ock\Ock\Plugin\Map\PluginMap_Buffer.inner: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@Ock\Ock\Plugin\Registry\PluginRegistryInterface' getClass(): Ock\Ock\Plugin\Map\PluginMap_Registry isPublic(): true -'++ Ock\Ock\Plugin\Registry\PluginRegistryInterface': +Ock\Ock\Plugin\Registry\PluginRegistryInterface: !add class: Symfony\Component\DependencyInjection\Definition $innerServiceId: Ock\Ock\Plugin\Registry\PluginRegistry_Buffer.inner $decorationOnInvalid: 1 @@ -203,13 +203,13 @@ type: container.definitions id: Ock\Ock\Plugin\Registry\PluginRegistryInterface inner: Ock\Ock\Plugin\Registry\PluginRegistry_Buffer.inner isPublic(): true -'++ Ock\Ock\Translator\TranslatorInterface': +Ock\Ock\Translator\TranslatorInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@string_translation' getClass(): Drupal\ock\Translator\Translator_Drupal isPublic(): true -'++ logger.channel.ock': +logger.channel.ock: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - ock diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml index 29870bfd0..8c433daa4 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml @@ -1,12 +1,12 @@ module: ock type: links.menu -'++ ock.devel_ops.clear': +ock.devel_ops.clear: !add menu_name: devel title: 'Rediscover Composition Plugins' -'++ ock.flush_ock.clear': +ock.flush_ock.clear: !add menu_name: admin title: 'Flush Ock plugins' -'++ ock.report_overview.overview': +ock.report_overview.overview: !add menu_name: tools title: 'ock plugins' parent: system.admin_reports diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml index 15a2e255b..198cbdc92 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml @@ -1,23 +1,23 @@ module: ock type: links.task -'++ ock.report_iface.code': +ock.report_iface.code: !add title: Code base_route: ock.report_iface.list_of_plugins -'++ ock.report_iface.demo': +ock.report_iface.demo: !add title: Demo base_route: ock.report_iface.list_of_plugins -'++ ock.report_iface.list_of_plugins': +ock.report_iface.list_of_plugins: !add title: 'List of plugins' base_route: ock.report_iface.list_of_plugins -'++ ock.report_plugin.code': +ock.report_plugin.code: !add title: Code base_route: ock.report_plugin.plugin -'++ ock.report_plugin.demo': +ock.report_plugin.demo: !add title: Demo base_route: ock.report_plugin.plugin -'++ ock.report_plugin.devel': +ock.report_plugin.devel: !add title: Devel base_route: ock.report_plugin.plugin -'++ ock.report_plugin.plugin': +ock.report_plugin.plugin: !add title: Plugin base_route: ock.report_plugin.plugin diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml index 1a69a4f30..8b2b874ad 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml @@ -1,6 +1,6 @@ module: ock type: routes -'++ /admin/flush/ock': +/admin/flush/ock: !add ock.flush_ock.clear: defaults: _controller: 'Drupal\ock\Controller\Controller_FlushOck::clear' @@ -13,7 +13,7 @@ type: routes menu_name: admin _access_checks: - access_check.permission -'++ /admin/reports/ock': +/admin/reports/ock: !add ock.report_overview.overview: defaults: _controller: 'Drupal\ock\Controller\Controller_ReportOverview::overview' @@ -25,7 +25,7 @@ type: routes _menu_link: { } _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}': +'/admin/reports/ock/{interface}': !add ock.report_iface.list_of_plugins: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportIface::title' @@ -42,7 +42,7 @@ type: routes title: 'List of plugins' _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/code': +'/admin/reports/ock/{interface}/code': !add ock.report_iface.code: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportIface::title' @@ -59,7 +59,7 @@ type: routes title: Code _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/demo': +'/admin/reports/ock/{interface}/demo': !add ock.report_iface.demo: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportIface::title' @@ -76,7 +76,7 @@ type: routes title: Demo _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/plugin/{named_plugin}': +'/admin/reports/ock/{interface}/plugin/{named_plugin}': !add ock.report_plugin.plugin: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportPlugin::title' @@ -96,7 +96,7 @@ type: routes title: Plugin _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/plugin/{named_plugin}/code': +'/admin/reports/ock/{interface}/plugin/{named_plugin}/code': !add ock.report_plugin.code: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportPlugin::title' @@ -116,7 +116,7 @@ type: routes title: Code _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/plugin/{named_plugin}/demo': +'/admin/reports/ock/{interface}/plugin/{named_plugin}/demo': !add ock.report_plugin.demo: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportPlugin::title' @@ -136,7 +136,7 @@ type: routes title: Demo _access_checks: - access_check.permission -'++ /admin/reports/ock/{interface}/plugin/{named_plugin}/devel': +'/admin/reports/ock/{interface}/plugin/{named_plugin}/devel': !add ock.report_plugin.devel: defaults: _title_callback: 'Drupal\ock\Controller\Controller_ReportPlugin::title' @@ -156,7 +156,7 @@ type: routes title: Devel _access_checks: - access_check.permission -'++ /devel/ock/clear': +/devel/ock/clear: !add ock.devel_ops.clear: defaults: _controller: 'Drupal\ock\Controller\Controller_DevelOps::clear' diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml index ce5ff9943..bd65d372f 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml @@ -1,21 +1,21 @@ module: ock_example type: container.definitions -'~~ Ock\Ock\Plugin\Registry\PluginRegistryInterface': +Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistryInterface getFactory(): - Ock\Ock\Plugin\Registry\PluginRegistry - fromCandidateObjects - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument - '~~ getValues()': + getValues(): !diff - !add '@Drupal\ock_example\OckExampleNamespace' -'++ Drupal\ock_example\OckExampleNamespace': +Drupal\ock_example\OckExampleNamespace: !add class: Symfony\Component\DependencyInjection\Definition getClass(): Drupal\ock_example\OckExampleNamespace getTags(): diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml index cac76156a..ab6ef5b3d 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml @@ -1,21 +1,21 @@ module: renderkit type: container.definitions -'~~ Ock\Ock\Plugin\Registry\PluginRegistryInterface': +Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistryInterface getFactory(): - Ock\Ock\Plugin\Registry\PluginRegistry - fromCandidateObjects - '~~ getArguments()': - '~~ 0': + getArguments(): !diff + - !diff class: Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument - '~~ getValues()': + getValues(): !diff - !add '@Drupal\renderkit\RenderkitNamespace' -'++ Drupal\renderkit\Formula\Formula_EntityFormMode': +Drupal\renderkit\Formula\Formula_EntityFormMode: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' @@ -24,26 +24,26 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityType getClass(): Drupal\renderkit\Formula\Formula_EntityFormMode isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EntityType': +Drupal\renderkit\Formula\Formula_EntityType: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.repository' getClass(): Drupal\renderkit\Formula\Formula_EntityType isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EntityType_Flat': +Drupal\renderkit\Formula\Formula_EntityType_Flat: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' getClass(): Drupal\renderkit\Formula\Formula_EntityType_Flat isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EntityType_WithFields': +Drupal\renderkit\Formula\Formula_EntityType_WithFields: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_field.manager' - '@entity_type.repository' getClass(): Drupal\renderkit\Formula\Formula_EntityType_WithFields isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EntityViewMode': +Drupal\renderkit\Formula\Formula_EntityViewMode: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' @@ -52,7 +52,7 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityType getClass(): Drupal\renderkit\Formula\Formula_EntityViewMode isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EtDotFieldName': +Drupal\renderkit\Formula\Formula_EtDotFieldName: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_field.manager' @@ -64,7 +64,7 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityFieldWithEntityType getClass(): Drupal\renderkit\Formula\Formula_EtDotFieldName isPublic(): true -'++ Drupal\renderkit\Formula\Formula_EtDotFieldName_EntityReference': +Drupal\renderkit\Formula\Formula_EtDotFieldName_EntityReference: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -77,7 +77,7 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityType getClass(): Drupal\renderkit\Formula\Formula_EtDotFieldName_EntityReference isPublic(): true -'++ Drupal\renderkit\Formula\Formula_FieldFormatterId': +Drupal\renderkit\Formula\Formula_FieldFormatterId: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -89,13 +89,13 @@ type: container.definitions $value: '@plugin.manager.field.formatter' getClass(): Drupal\renderkit\Formula\Formula_FieldFormatterId isPublic(): true -'++ Drupal\renderkit\Formula\Formula_FieldType_Flat': +Drupal\renderkit\Formula\Formula_FieldType_Flat: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@plugin.manager.field.field_type' getClass(): Drupal\renderkit\Formula\Formula_FieldType_Flat isPublic(): true -'++ Drupal\renderkit\Helper\FieldDefinitionLookupInterface': +Drupal\renderkit\Helper\FieldDefinitionLookupInterface: !add class: Symfony\Component\DependencyInjection\Definition $innerServiceId: Drupal\renderkit\Helper\FieldDefinitionLookup_Buffer.inner $decorationOnInvalid: 1 @@ -103,13 +103,13 @@ type: container.definitions - '@Drupal\renderkit\Helper\FieldDefinitionLookup_Buffer.inner' getClass(): Drupal\renderkit\Helper\FieldDefinitionLookup_Buffer isPublic(): true -'++ Drupal\renderkit\Helper\FieldDefinitionLookup_Buffer.inner': +Drupal\renderkit\Helper\FieldDefinitionLookup_Buffer.inner: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_field.manager' getClass(): Drupal\renderkit\Helper\FieldDefinitionLookup isPublic(): true -'++ Drupal\renderkit\Helper\FormatterPluginLookup': +Drupal\renderkit\Helper\FormatterPluginLookup: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@Drupal\renderkit\Helper\FieldDefinitionLookupInterface' @@ -122,19 +122,19 @@ type: container.definitions $value: '@plugin.manager.field.formatter' getClass(): Drupal\renderkit\Helper\FormatterPluginLookup isPublic(): true -'++ Drupal\renderkit\RenderkitNamespace': +Drupal\renderkit\RenderkitNamespace: !add class: Symfony\Component\DependencyInjection\Definition getClass(): Drupal\renderkit\RenderkitNamespace getTags(): ock.discovery: - { } -'++ Drupal\renderkit\TextLookup\TextLookup_BaseField': +Drupal\renderkit\TextLookup\TextLookup_BaseField: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_field.manager' getClass(): Drupal\renderkit\TextLookup\TextLookup_BaseField isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_BundleField': +Drupal\renderkit\TextLookup\TextLookup_BundleField: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -146,13 +146,13 @@ type: container.definitions $value: '@entity_field.manager' getClass(): Drupal\renderkit\TextLookup\TextLookup_BundleField isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_EntityField': +Drupal\renderkit\TextLookup\TextLookup_EntityField: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_field.manager' getClass(): Drupal\renderkit\TextLookup\TextLookup_EntityField isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_EntityFieldWithEntityType': +Drupal\renderkit\TextLookup\TextLookup_EntityFieldWithEntityType: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -163,13 +163,13 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityField getClass(): Drupal\renderkit\TextLookup\TextLookup_EntityFieldWithEntityType isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_EntityType': +Drupal\renderkit\TextLookup\TextLookup_EntityType: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' getClass(): Drupal\renderkit\TextLookup\TextLookup_EntityType isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_EntityTypeDotId': +Drupal\renderkit\TextLookup\TextLookup_EntityTypeDotId: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' @@ -178,13 +178,13 @@ type: container.definitions $type: Drupal\renderkit\TextLookup\TextLookup_EntityType getClass(): Drupal\renderkit\TextLookup\TextLookup_EntityTypeDotId isPublic(): true -'++ Drupal\renderkit\TextLookup\TextLookup_FieldType': +Drupal\renderkit\TextLookup\TextLookup_FieldType: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@plugin.manager.field.field_type' getClass(): Drupal\renderkit\TextLookup\TextLookup_FieldType isPublic(): true -'++ lookup.Drupal\renderkit\Formula\Formula_ConfigEntityId': +lookup.Drupal\renderkit\Formula\Formula_ConfigEntityId: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' @@ -193,7 +193,7 @@ type: container.definitions - Drupal\renderkit\Formula\Formula_ConfigEntityId - createLookup isPublic(): true -'++ lookup.Drupal\renderkit\Formula\Formula_EntityIdAutocomplete': +lookup.Drupal\renderkit\Formula\Formula_EntityIdAutocomplete: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@entity_type.manager' @@ -202,7 +202,7 @@ type: container.definitions - Drupal\renderkit\Formula\Formula_EntityIdAutocomplete - getFactory isPublic(): true -'++ lookup.Drupal\renderkit\Formula\Formula_FieldName': +lookup.Drupal\renderkit\Formula\Formula_FieldName: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - @@ -221,7 +221,7 @@ type: container.definitions - Drupal\renderkit\Formula\Formula_FieldName - createLookup isPublic(): true -'++ lookup.Drupal\renderkit\TextLookup\TextLookup_FieldName': +lookup.Drupal\renderkit\TextLookup\TextLookup_FieldName: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml index cd2909698..2fe704a73 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml @@ -1,10 +1,10 @@ module: renderkit type: links.menu -'++ renderkit.report.demo': +renderkit.report.demo: !add menu_name: tools title: 'Build provider demo' parent: renderkit.report.index -'++ renderkit.report.index': +renderkit.report.index: !add menu_name: tools title: Renderkit parent: system.admin_reports diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml index 802d81218..e5aac6526 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml @@ -1,6 +1,6 @@ module: renderkit type: routes -'++ /admin/reports/renderkit': +/admin/reports/renderkit: !add renderkit.report.index: defaults: _controller: 'Drupal\renderkit\Controller\Controller_Report::index' @@ -12,7 +12,7 @@ type: routes _menu_link: { } _access_checks: - access_check.permission -'++ /admin/reports/renderkit/build-provider-demo': +/admin/reports/renderkit/build-provider-demo: !add renderkit.report.demo: defaults: _controller: 'Drupal\renderkit\Controller\Controller_Report::demo' diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml index 8e26f836a..aea8d2b1c 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml @@ -1,5 +1,5 @@ module: service_discovery type: container.aliases -'++ Psr\Container\ContainerInterface': +Psr\Container\ContainerInterface: !add class: Symfony\Component\DependencyInjection\Alias isPublic(): true diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml index 795b0e802..2b9f22282 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml @@ -1,6 +1,6 @@ module: service_discovery type: container.definitions -'++ Drupal\service_discovery\CallbackResolverInterface': +Drupal\service_discovery\CallbackResolverInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - '@service_container' diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml index 903685eed..f627fc3cf 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml @@ -1,6 +1,6 @@ module: service_discovery_test type: container.definitions -'++ Drupal\service_discovery_test\ServiceAtlas': +Drupal\service_discovery_test\ServiceAtlas: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): - diff --git a/packages/testing/src/Diff/ExportedArrayDiffer.php b/packages/testing/src/Diff/ExportedArrayDiffer.php index 2e4ceb23c..1008266f0 100644 --- a/packages/testing/src/Diff/ExportedArrayDiffer.php +++ b/packages/testing/src/Diff/ExportedArrayDiffer.php @@ -138,7 +138,7 @@ protected function doCompareLists(array $before, array $after, int $i_before = 0 if ($i_after >= count($after)) { // There are more items in "before" list. for (; $i_before < count($before); ++$i_before) { - $diff[] = new TaggedValue('--', $before[$i_before]); + $diff[] = new TaggedValue('rm', $before[$i_before]); } return $diff; } @@ -165,7 +165,7 @@ protected function doCompareLists(array $before, array $after, int $i_before = 0 if (count($diff_minus) <= count($diff_plus)) { return [ ...$diff, - new TaggedValue('--', $before[$i_before]), + new TaggedValue('rm', $before[$i_before]), ...$diff_minus, ]; } @@ -193,16 +193,15 @@ protected function compareAssoc(array $before, array $after): array|false { $diff = []; $similar = false; foreach (array_diff_key($before, $after) as $key => $item) { - $diff['-- ' . $key] = $item; + $diff[$key] = new TaggedValue('rm', $item); } foreach ($shared_keys as $key) { $item_diff = $this->compareValues($before[$key], $after[$key]); if ($item_diff === false) { - $diff['~- ' . $key] = $before[$key]; - $diff['~+ ' . $key] = $after[$key]; + $diff[$key] = new TaggedValue('replace', $after[$key]); } elseif ($item_diff) { - $diff['~~ ' . $key] = $item_diff; + $diff[$key] = new TaggedValue('diff', $item_diff); $similar = true; } else { @@ -213,7 +212,7 @@ protected function compareAssoc(array $before, array $after): array|false { return false; } foreach (array_diff_key($after, $before) as $key => $item) { - $diff['++ ' . $key] = $item; + $diff[$key] = new TaggedValue('add', $item); } return $diff; } @@ -235,16 +234,15 @@ protected function compareExportedObjects(array $before, array $after, string $c ); $diff = []; foreach (array_diff_key($before, $after) as $key => $item) { - $diff['-- ' . $key] = $item; + $diff[$key] = new TaggedValue('rm', $item); } foreach ($shared_keys as $key) { $item_diff = $this->compareExportedObjectProperty($class, $key, $before[$key], $after[$key]); if ($item_diff === false) { - $diff['~- ' . $key] = $before[$key]; - $diff['~+ ' . $key] = $after[$key]; + $diff[$key] = new TaggedValue('replace', $after[$key]); } elseif ($item_diff) { - $diff['~~ ' . $key] = $item_diff; + $diff[$key] = new TaggedValue('diff', $item_diff); } } if (!$diff) { diff --git a/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml b/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml index c43b029c8..58b4659e6 100644 --- a/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml +++ b/packages/testing/tests/fixtures/ExportedArrayDifferTest/assoc.hello.yml @@ -29,22 +29,16 @@ after: 'good day': bonjour internet: internet diff: - '-- assoc_drop': + assoc_drop: !rm x: X - '-- remove': remove - '~~ assoc_diff': - '~- b': B - '~+ b': BB - '~- assoc_replace': - r: R - '~+ assoc_replace': + remove: !rm remove + assoc_diff: !diff + b: !replace BB + assoc_replace: !replace rr: RR - '~- good day': 'good day' - '~+ good day': bonjour - '~- goodbye': goodbye - '~+ goodbye': 'a bientot' - '~- hello': hello - '~+ hello': salut - '++ ajouter': ajouter - '++ assoc_new': + 'good day': !replace bonjour + goodbye: !replace 'a bientot' + hello: !replace salut + ajouter: !add ajouter + assoc_new: !add new: New diff --git a/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.change-assoc-value.yml b/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.change-assoc-value.yml index 50a41061d..a788a9457 100644 --- a/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.change-assoc-value.yml +++ b/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.change-assoc-value.yml @@ -17,12 +17,11 @@ after: b: 'B orig' - after diff: - - !-- + - !rm a: 'A orig' b: 'B orig' - !add a: 'A changed' b: 'B changed' - !diff - '~- a': 'A orig' - '~+ a': 'A changed' + a: !replace 'A changed' diff --git a/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.hello.yml b/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.hello.yml index 9e13c7a49..2426777fa 100644 --- a/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.hello.yml +++ b/packages/testing/tests/fixtures/ExportedArrayDifferTest/list.hello.yml @@ -5,5 +5,5 @@ after: - goodbye - world diff: - - !-- hello + - !rm hello - !add goodbye From 670fdc4ec53fc547ed05cc7cb0f7e6570375f394 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Sun, 22 Jun 2025 13:47:06 +0200 Subject: [PATCH 4/5] Rename recording files to append '.recording.yml' suffix. --- ... controller_attributes.container.definitions.recording.yml} | 0 ...summary.yml => controller_attributes.summary.recording.yml} | 0 ...l => controller_attributes_test.links.action.recording.yml} | 0 ...yml => controller_attributes_test.links.menu.recording.yml} | 0 ...yml => controller_attributes_test.links.task.recording.yml} | 0 ...ml => controller_attributes_test.route_paths.recording.yml} | 0 ...tes.yml => controller_attributes_test.routes.recording.yml} | 0 ...ry.yml => controller_attributes_test.summary.recording.yml} | 0 ...ions.yml => ock_preset.container.definitions.recording.yml} | 0 ....links.action.yml => ock_preset.links.action.recording.yml} | 0 ...eset.links.menu.yml => ock_preset.links.menu.recording.yml} | 0 ...eset.links.task.yml => ock_preset.links.task.recording.yml} | 0 ...et.route_paths.yml => ock_preset.route_paths.recording.yml} | 0 .../{ock_preset.routes.yml => ock_preset.routes.recording.yml} | 0 ...ock_preset.summary.yml => ock_preset.summary.recording.yml} | 0 ...definitions.yml => ock.container.definitions.recording.yml} | 0 .../{ock.links.menu.yml => ock.links.menu.recording.yml} | 0 .../{ock.links.task.yml => ock.links.task.recording.yml} | 0 .../{ock.route_paths.yml => ock.route_paths.recording.yml} | 0 .../{ock.routes.yml => ock.routes.recording.yml} | 0 .../{ock.summary.yml => ock.summary.recording.yml} | 0 ...ons.yml => ock_example.container.definitions.recording.yml} | 0 ...k_example.summary.yml => ock_example.summary.recording.yml} | 0 ...tions.yml => renderkit.container.definitions.recording.yml} | 0 ...erkit.links.menu.yml => renderkit.links.menu.recording.yml} | 0 ...kit.route_paths.yml => renderkit.route_paths.recording.yml} | 0 .../{renderkit.routes.yml => renderkit.routes.recording.yml} | 0 .../{renderkit.summary.yml => renderkit.summary.recording.yml} | 0 ...s.yml => service_discovery.container.aliases.recording.yml} | 0 ...l => service_discovery.container.definitions.recording.yml} | 0 ...ery.summary.yml => service_discovery.summary.recording.yml} | 0 ...service_discovery_test.container.definitions.recording.yml} | 0 ...ummary.yml => service_discovery_test.summary.recording.yml} | 0 packages/drupal-testing/src/ModuleSnapshotTestTrait.php | 3 ++- 34 files changed, 2 insertions(+), 1 deletion(-) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes.container.definitions.yml => controller_attributes.container.definitions.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes.summary.yml => controller_attributes.summary.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.links.action.yml => controller_attributes_test.links.action.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.links.menu.yml => controller_attributes_test.links.menu.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.links.task.yml => controller_attributes_test.links.task.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.route_paths.yml => controller_attributes_test.route_paths.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.routes.yml => controller_attributes_test.routes.recording.yml} (100%) rename modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/{controller_attributes_test.summary.yml => controller_attributes_test.summary.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.container.definitions.yml => ock_preset.container.definitions.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.links.action.yml => ock_preset.links.action.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.links.menu.yml => ock_preset.links.menu.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.links.task.yml => ock_preset.links.task.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.route_paths.yml => ock_preset.route_paths.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.routes.yml => ock_preset.routes.recording.yml} (100%) rename modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/{ock_preset.summary.yml => ock_preset.summary.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.container.definitions.yml => ock.container.definitions.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.links.menu.yml => ock.links.menu.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.links.task.yml => ock.links.task.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.route_paths.yml => ock.route_paths.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.routes.yml => ock.routes.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock.summary.yml => ock.summary.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock_example.container.definitions.yml => ock_example.container.definitions.recording.yml} (100%) rename modules/ock/tests/recordings/Kernel/OckSnapshotTest/{ock_example.summary.yml => ock_example.summary.recording.yml} (100%) rename modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/{renderkit.container.definitions.yml => renderkit.container.definitions.recording.yml} (100%) rename modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/{renderkit.links.menu.yml => renderkit.links.menu.recording.yml} (100%) rename modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/{renderkit.route_paths.yml => renderkit.route_paths.recording.yml} (100%) rename modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/{renderkit.routes.yml => renderkit.routes.recording.yml} (100%) rename modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/{renderkit.summary.yml => renderkit.summary.recording.yml} (100%) rename modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/{service_discovery.container.aliases.yml => service_discovery.container.aliases.recording.yml} (100%) rename modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/{service_discovery.container.definitions.yml => service_discovery.container.definitions.recording.yml} (100%) rename modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/{service_discovery.summary.yml => service_discovery.summary.recording.yml} (100%) rename modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/{service_discovery_test.container.definitions.yml => service_discovery_test.container.definitions.recording.yml} (100%) rename modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/{service_discovery_test.summary.yml => service_discovery_test.summary.recording.yml} (100%) diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml similarity index 100% rename from modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.yml rename to modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml similarity index 100% rename from modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.yml rename to modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml similarity index 100% rename from modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.yml rename to modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml similarity index 100% rename from modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.yml rename to modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml similarity index 100% rename from modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.yml rename to modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml similarity index 100% rename from modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.yml rename to modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml similarity index 100% rename from modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.yml rename to modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml similarity index 100% rename from modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.yml rename to modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml similarity index 100% rename from modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.yml rename to modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml similarity index 100% rename from modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.yml rename to modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml similarity index 100% rename from modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.yml rename to modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml similarity index 100% rename from modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.yml rename to modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml similarity index 100% rename from modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.yml rename to modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml diff --git a/packages/drupal-testing/src/ModuleSnapshotTestTrait.php b/packages/drupal-testing/src/ModuleSnapshotTestTrait.php index 1c63eac2e..e8413e9db 100644 --- a/packages/drupal-testing/src/ModuleSnapshotTestTrait.php +++ b/packages/drupal-testing/src/ModuleSnapshotTestTrait.php @@ -89,7 +89,8 @@ protected function assertReportsAsRecorded(string $prefix, array $reports): void $base_path = $this->getClassRecordingsPath(); foreach ($reports as $key => $report) { $yaml = ($report === NULL) ? NULL : Yaml::encode($report); - $file = $base_path . '/' . $prefix . '.' . $key . '.yml'; + // Use '.recording.yml' suffix, to not trigger any schema validation. + $file = $base_path . '/' . $prefix . '.' . $key . '.recording.yml'; $this->assertFileAsRecorded($file, $yaml); } } From 81c10d89a10d14bb1338d8a560e6d6c19b8248c4 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Sun, 22 Jun 2025 14:05:33 +0200 Subject: [PATCH 5/5] Use comments in exported yml files. --- ...ibutes.container.definitions.recording.yml | 4 +-- ...ontroller_attributes.summary.recording.yml | 20 ++++++------ ...attributes_test.links.action.recording.yml | 4 +-- ...r_attributes_test.links.menu.recording.yml | 4 +-- ...r_attributes_test.links.task.recording.yml | 4 +-- ..._attributes_test.route_paths.recording.yml | 4 +-- ...oller_attributes_test.routes.recording.yml | 4 +-- ...ller_attributes_test.summary.recording.yml | 20 ++++++------ ...preset.container.definitions.recording.yml | 4 +-- .../ock_preset.links.action.recording.yml | 4 +-- .../ock_preset.links.menu.recording.yml | 4 +-- .../ock_preset.links.task.recording.yml | 4 +-- .../ock_preset.route_paths.recording.yml | 4 +-- .../ock_preset.routes.recording.yml | 4 +-- .../ock_preset.summary.recording.yml | 20 ++++++------ .../ock.container.definitions.recording.yml | 4 +-- .../ock.links.menu.recording.yml | 4 +-- .../ock.links.task.recording.yml | 4 +-- .../ock.route_paths.recording.yml | 4 +-- .../OckSnapshotTest/ock.routes.recording.yml | 4 +-- .../OckSnapshotTest/ock.summary.recording.yml | 20 ++++++------ ...xample.container.definitions.recording.yml | 4 +-- .../ock_example.summary.recording.yml | 20 ++++++------ ...derkit.container.definitions.recording.yml | 4 +-- .../renderkit.links.menu.recording.yml | 4 +-- .../renderkit.route_paths.recording.yml | 4 +-- .../renderkit.routes.recording.yml | 4 +-- .../renderkit.summary.recording.yml | 20 ++++++------ ..._discovery.container.aliases.recording.yml | 4 +-- ...covery.container.definitions.recording.yml | 4 +-- .../service_discovery.summary.recording.yml | 20 ++++++------ ...y_test.container.definitions.recording.yml | 4 +-- ...rvice_discovery_test.summary.recording.yml | 20 ++++++------ .../src/ModuleSnapshotTestTrait.php | 32 ++++++++----------- 34 files changed, 144 insertions(+), 148 deletions(-) diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml index a56af3a47..6ac1f4c36 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes -type: container.definitions +# controller_attributes +# container.definitions Drupal\controller_attributes\Hook\LinksFromRoutes: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml index a044d8dcd..6c56e7dc3 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes.summary.recording.yml @@ -1,10 +1,10 @@ -module: controller_attributes -snapshots: - links.action: '==' - links.menu: '==' - links.task: '==' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '==' - routes: '==' +# controller_attributes +# summary +links.action: '==' +links.menu: '==' +links.task: '==' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '==' +routes: '==' diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml index 797be21ca..7cc8c6a9e 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.action.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes_test -type: links.action +# controller_attributes_test +# links.action controller_attributes_test.hello_user_overview.add: !add title: 'Add user' appears_on: diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml index 424f3866d..3b7907315 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.menu.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes_test -type: links.menu +# controller_attributes_test +# links.menu controller_attributes_test.hello.goodbye: !add menu_name: tools title: Goodbye diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml index e4f9926f7..0f7c5798f 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.links.task.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes_test -type: links.task +# controller_attributes_test +# links.task controller_attributes_test.hello_user.delete_user_different_base_route: !add title: Edit base_route: entity.user.canonical diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml index 5ed64a356..f53d75ca6 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.route_paths.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes_test -type: route_paths +# controller_attributes_test +# route_paths ++: - /controller-attributes-test/goodbye - /controller-attributes-test/hello diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml index b8444f4c3..25b0afd6f 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.routes.recording.yml @@ -1,5 +1,5 @@ -module: controller_attributes_test -type: routes +# controller_attributes_test +# routes /controller-attributes-test/goodbye: !add controller_attributes_test.hello.goodbye: defaults: diff --git a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml index 7e08c1f8c..631305381 100644 --- a/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml +++ b/modules/controller_attributes/tests/recordings/Kernel/ControllerAttributesSnapshotTest/controller_attributes_test.summary.recording.yml @@ -1,10 +1,10 @@ -module: controller_attributes_test -snapshots: - links.action: '!=' - links.menu: '!=' - links.task: '!=' - container.definitions: '==' - container.aliases: '==' - container.parameters: '==' - route_paths: '!=' - routes: '!=' +# controller_attributes_test +# summary +links.action: '!=' +links.menu: '!=' +links.task: '!=' +container.definitions: '==' +container.aliases: '==' +container.parameters: '==' +route_paths: '!=' +routes: '!=' diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml index 6d4b13815..09f6cacbb 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: container.definitions +# ock_preset +# container.definitions Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml index 6542939a8..68fb4bdbc 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.action.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: links.action +# ock_preset +# links.action ock_preset.iface_presets.add: !add title: 'Add preset' appears_on: diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml index 62e76a4cc..379c08813 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.menu.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: links.menu +# ock_preset +# links.menu ock_preset.all_presets_overview.index: !add menu_name: tools title: 'ock_preset presets' diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml index 4e1df2374..e5c7413ad 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.links.task.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: links.task +# ock_preset +# links.task ock_preset.iface_presets.add: !add title: 'Add preset' base_route: ock_preset.iface_presets.index diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml index 3d65eb278..1e9578488 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.route_paths.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: route_paths +# ock_preset +# route_paths ++: - /admin/structure/ock_preset - '/admin/structure/ock_preset/{interface}' diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml index d6c64b76c..abbbac7c0 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.routes.recording.yml @@ -1,5 +1,5 @@ -module: ock_preset -type: routes +# ock_preset +# routes /admin/structure/ock_preset: !add ock_preset.all_presets_overview.index: defaults: diff --git a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml index 1203429bc..703f7d7ba 100644 --- a/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml +++ b/modules/ock/modules/ock_preset/tests/recordings/Kernel/OckPresetSnapshotTest/ock_preset.summary.recording.yml @@ -1,10 +1,10 @@ -module: ock_preset -snapshots: - links.action: '!=' - links.menu: '!=' - links.task: '!=' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '!=' - routes: '!=' +# ock_preset +# summary +links.action: '!=' +links.menu: '!=' +links.task: '!=' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '!=' +routes: '!=' diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml index 8032f6fa3..096f14312 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: ock -type: container.definitions +# ock +# container.definitions paramconverter_manager: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Drupal\Core\ParamConverter\ParamConverterManager diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml index 8c433daa4..238657879 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.menu.recording.yml @@ -1,5 +1,5 @@ -module: ock -type: links.menu +# ock +# links.menu ock.devel_ops.clear: !add menu_name: devel title: 'Rediscover Composition Plugins' diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml index 198cbdc92..65bfb75bb 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.links.task.recording.yml @@ -1,5 +1,5 @@ -module: ock -type: links.task +# ock +# links.task ock.report_iface.code: !add title: Code base_route: ock.report_iface.list_of_plugins diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml index efb7d165a..a6e540fa9 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.route_paths.recording.yml @@ -1,5 +1,5 @@ -module: ock -type: route_paths +# ock +# route_paths ++: - /admin/flush/ock - /admin/reports/ock diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml index 8b2b874ad..98b019c8f 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.routes.recording.yml @@ -1,5 +1,5 @@ -module: ock -type: routes +# ock +# routes /admin/flush/ock: !add ock.flush_ock.clear: defaults: diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml index 347a19855..6830b3136 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock.summary.recording.yml @@ -1,10 +1,10 @@ -module: ock -snapshots: - links.action: '==' - links.menu: '!=' - links.task: '!=' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '!=' - routes: '!=' +# ock +# summary +links.action: '==' +links.menu: '!=' +links.task: '!=' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '!=' +routes: '!=' diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml index bd65d372f..0761ed172 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: ock_example -type: container.definitions +# ock_example +# container.definitions Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer diff --git a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml index 918f2ec8c..8f45cd1d4 100644 --- a/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml +++ b/modules/ock/tests/recordings/Kernel/OckSnapshotTest/ock_example.summary.recording.yml @@ -1,10 +1,10 @@ -module: ock_example -snapshots: - links.action: '==' - links.menu: '==' - links.task: '==' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '==' - routes: '==' +# ock_example +# summary +links.action: '==' +links.menu: '==' +links.task: '==' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '==' +routes: '==' diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml index ab6ef5b3d..635ce791d 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: renderkit -type: container.definitions +# renderkit +# container.definitions Ock\Ock\Plugin\Registry\PluginRegistryInterface: !diff class: Symfony\Component\DependencyInjection\Definition getClass(): Ock\Ock\Plugin\Registry\PluginRegistry_Buffer diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml index 2fe704a73..4710d2e3d 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.links.menu.recording.yml @@ -1,5 +1,5 @@ -module: renderkit -type: links.menu +# renderkit +# links.menu renderkit.report.demo: !add menu_name: tools title: 'Build provider demo' diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml index f464ecac9..ce6163c52 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.route_paths.recording.yml @@ -1,5 +1,5 @@ -module: renderkit -type: route_paths +# renderkit +# route_paths ++: - /admin/reports/renderkit - /admin/reports/renderkit/build-provider-demo diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml index e5aac6526..33bb62957 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.routes.recording.yml @@ -1,5 +1,5 @@ -module: renderkit -type: routes +# renderkit +# routes /admin/reports/renderkit: !add renderkit.report.index: defaults: diff --git a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml index b928a1e21..c549654d0 100644 --- a/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml +++ b/modules/renderkit/tests/recordings/Kernel/RenderkitSnapshotTest/renderkit.summary.recording.yml @@ -1,10 +1,10 @@ -module: renderkit -snapshots: - links.action: '==' - links.menu: '!=' - links.task: '==' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '!=' - routes: '!=' +# renderkit +# summary +links.action: '==' +links.menu: '!=' +links.task: '==' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '!=' +routes: '!=' diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml index aea8d2b1c..68400c294 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.aliases.recording.yml @@ -1,5 +1,5 @@ -module: service_discovery -type: container.aliases +# service_discovery +# container.aliases Psr\Container\ContainerInterface: !add class: Symfony\Component\DependencyInjection\Alias isPublic(): true diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml index 2b9f22282..c2b904922 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: service_discovery -type: container.definitions +# service_discovery +# container.definitions Drupal\service_discovery\CallbackResolverInterface: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml index 1da43f581..acdc2e4e6 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery.summary.recording.yml @@ -1,10 +1,10 @@ -module: service_discovery -snapshots: - links.action: '==' - links.menu: '==' - links.task: '==' - container.definitions: '!=' - container.aliases: '!=' - container.parameters: '==' - route_paths: '==' - routes: '==' +# service_discovery +# summary +links.action: '==' +links.menu: '==' +links.task: '==' +container.definitions: '!=' +container.aliases: '!=' +container.parameters: '==' +route_paths: '==' +routes: '==' diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml index f627fc3cf..9dc07ee3e 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.container.definitions.recording.yml @@ -1,5 +1,5 @@ -module: service_discovery_test -type: container.definitions +# service_discovery_test +# container.definitions Drupal\service_discovery_test\ServiceAtlas: !add class: Symfony\Component\DependencyInjection\Definition getArguments(): diff --git a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml index e221e1a06..d366c1f40 100644 --- a/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml +++ b/modules/service_discovery/tests/recordings/Kernel/ServiceDiscoverySnapshotTest/service_discovery_test.summary.recording.yml @@ -1,10 +1,10 @@ -module: service_discovery_test -snapshots: - links.action: '==' - links.menu: '==' - links.task: '==' - container.definitions: '!=' - container.aliases: '==' - container.parameters: '==' - route_paths: '==' - routes: '==' +# service_discovery_test +# summary +links.action: '==' +links.menu: '==' +links.task: '==' +container.definitions: '!=' +container.aliases: '==' +container.parameters: '==' +route_paths: '==' +routes: '==' diff --git a/packages/drupal-testing/src/ModuleSnapshotTestTrait.php b/packages/drupal-testing/src/ModuleSnapshotTestTrait.php index e8413e9db..a73ca52bb 100644 --- a/packages/drupal-testing/src/ModuleSnapshotTestTrait.php +++ b/packages/drupal-testing/src/ModuleSnapshotTestTrait.php @@ -59,25 +59,12 @@ protected function createDiffs(string $module): array { */ protected function createReportsFromDiffs(string $module, array $diffs): array { $reports = []; + $summary = []; foreach ($diffs as $key => $diff) { - if (!$diff) { - $reports[$key] = NULL; - } - else { - $info = [ - 'module' => $module, - 'type' => $key, - ]; - $reports[$key] = $info + $diff; - } + $reports[$key] = $diff ?: NULL; + $summary[$key] = $diff ? '!=' : '=='; } - $reports['summary'] = [ - 'module' => $module, - 'snapshots' => array_map( - fn (array $diff) => $diff ? '!=' : '==', - $diffs, - ), - ]; + $reports['summary'] = $summary; return $reports; } @@ -88,7 +75,16 @@ protected function createReportsFromDiffs(string $module, array $diffs): array { protected function assertReportsAsRecorded(string $prefix, array $reports): void { $base_path = $this->getClassRecordingsPath(); foreach ($reports as $key => $report) { - $yaml = ($report === NULL) ? NULL : Yaml::encode($report); + if ($report === NULL) { + // The file should be deleted / not exist. + $yaml = NULL; + } + else { + $yaml = Yaml::encode($report); + // Prepend a comment. + // This helps prevent undesired rename detection in git. + $yaml = '# ' . $prefix . "\n# " . $key . "\n" . $yaml; + } // Use '.recording.yml' suffix, to not trigger any schema validation. $file = $base_path . '/' . $prefix . '.' . $key . '.recording.yml'; $this->assertFileAsRecorded($file, $yaml);