Skip to content
Snippets Groups Projects
Commit 42cbf89c authored by Edouard Cunibil's avatar Edouard Cunibil Committed by Florent Torregrosa
Browse files

Issue #3349079 by DuaelFr, Grimreaper: [2.0.x] Move YAML discovery from...

Issue #3349079 by DuaelFr, Grimreaper: [2.0.x] Move YAML discovery from ui_patterns_library to ui_patterns
parent 5597c7b4
No related branches found
No related tags found
1 merge request!29Issue #3349079: Move YAML discovery from ui_patterns_library to ui_patterns
Showing
with 13 additions and 20 deletions
......@@ -9,7 +9,6 @@ dependencies:
- drupal:text
- ui_patterns:ui_patterns
- ui_patterns:ui_patterns_layouts
- ui_patterns:ui_patterns_library
config_devel:
install:
......
......@@ -42,7 +42,6 @@ class UiPatternsLayoutsRenderTest extends WebDriverTestBase {
'ui_patterns',
'ui_patterns_layouts',
'ui_patterns_layouts_test',
'ui_patterns_library',
];
/**
......
......@@ -40,7 +40,6 @@ class UiPatternsLayoutsSettingsTest extends WebDriverTestBase {
'ui_patterns',
'ui_patterns_layouts',
'ui_patterns_layouts_test',
'ui_patterns_library',
];
/**
......
parameters:
ui_patterns_library.file_extensions:
- ".ui_patterns.yml"
- ".patterns.yml"
- ".pattern.yml"
......@@ -7,7 +7,6 @@ dependencies:
- drupal:text
- drupal:views_ui
- ui_patterns:ui_patterns
- ui_patterns:ui_patterns_library
- ui_patterns:ui_patterns_views
config_devel:
......
<?php
namespace Drupal\ui_patterns_library\Plugin\Deriver;
namespace Drupal\ui_patterns\Plugin\Deriver;
use Drupal\Component\Serialization\Yaml;
use Drupal\Core\Extension\ExtensionDiscovery;
......@@ -15,9 +15,9 @@ use Drupal\Core\Extension\ThemeHandlerInterface;
/**
* Plugin deriver for UI Patterns library.
*
* @package Drupal\ui_patterns_library\Deriver
* @package Drupal\ui_patterns\Deriver
*/
class LibraryDeriver extends AbstractYamlPatternsDeriver {
class YamlPatternDeriver extends AbstractYamlPatternsDeriver {
/**
* The base plugin ID.
......@@ -114,7 +114,7 @@ class LibraryDeriver extends AbstractYamlPatternsDeriver {
$container->get('messenger'),
$container->get('file_system'),
$container->getParameter('app.root'),
$container->getParameter('ui_patterns_library.file_extensions'),
$container->getParameter('ui_patterns.file_extensions'),
$container->get('module_handler'),
$container->get('theme_handler')
);
......
<?php
namespace Drupal\ui_patterns_library\Plugin\UiPatterns\Pattern;
namespace Drupal\ui_patterns\Plugin\UiPatterns\Pattern;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Extension\ThemeHandlerInterface;
......@@ -15,12 +15,12 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
*
* @UiPattern(
* id = "yaml",
* label = @Translation("Library Pattern"),
* label = @Translation("YAML Pattern"),
* description = @Translation("Pattern defined using a YAML file."),
* deriver = "\Drupal\ui_patterns_library\Plugin\Deriver\LibraryDeriver"
* deriver = "\Drupal\ui_patterns\Plugin\Deriver\YamlPatternDeriver"
* )
*/
class LibraryPattern extends PatternBase {
class YamlPattern extends PatternBase {
/**
* Theme handler.
......
......@@ -18,7 +18,6 @@ class YamlDeriverTest extends AbstractUiPatternsTest {
protected static $modules = [
'system',
'ui_patterns',
'ui_patterns_library',
];
/**
......
......@@ -17,7 +17,6 @@ class UiPatternsManagerTest extends AbstractUiPatternsTest {
protected static $modules = [
'system',
'ui_patterns',
'ui_patterns_library',
];
/**
......
......@@ -20,7 +20,6 @@ class UiPatternsPreviewTest extends AbstractUiPatternsTest {
protected static $modules = [
'system',
'ui_patterns',
'ui_patterns_library',
'ui_patterns_render_test',
];
......
parameters:
ui_patterns.file_extensions:
- ".ui_patterns.yml"
- ".patterns.yml"
- ".pattern.yml"
services:
plugin.manager.ui_patterns:
class: Drupal\ui_patterns\UiPatternsManager
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment