diff --git a/core/core.services.yml b/core/core.services.yml index 0bb13d0..001e3cc 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -288,7 +288,7 @@ services: tags: - { name: persist } current_route_match: - class: Drupal\Core\Routing\CurrentRouteMatch + class: Drupal\Component\Routing\CurrentRouteMatch arguments: ['@request_stack'] event_dispatcher: class: Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher diff --git a/core/includes/theme.inc b/core/includes/theme.inc index fe33025..2fa2e98 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -18,7 +18,7 @@ use Drupal\Core\Page\FeedLinkElement; use Drupal\Core\Page\LinkElement; use Drupal\Core\Page\MetaElement; -use Drupal\Core\Routing\RouteMatch; +use Drupal\Component\Routing\RouteMatch; use Drupal\Core\Template\Attribute; use Drupal\Core\Theme\ThemeSettings; use Drupal\Component\Utility\NestedArray; diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index 6409fd3..ee1536e 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -190,7 +190,7 @@ public static function request() { /** * Retrieves the currently active route match object. * - * @return \Drupal\Core\Routing\RouteMatchInterface + * @return \Drupal\Component\Routing\RouteMatchInterface * The currently active route match object. */ public static function routeMatch() { diff --git a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php b/core/lib/Drupal/Component/Routing/CurrentRouteMatch.php similarity index 89% rename from core/lib/Drupal/Core/Routing/CurrentRouteMatch.php rename to core/lib/Drupal/Component/Routing/CurrentRouteMatch.php index b188930..c730494 100644 --- a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php +++ b/core/lib/Drupal/Component/Routing/CurrentRouteMatch.php @@ -2,11 +2,13 @@ /** * @file - * Contains Drupal\Core\Routing\CurrentRouteMatch. + * Contains Drupal\Component\Routing\CurrentRouteMatch. */ -namespace Drupal\Core\Routing; +namespace Drupal\Component\Routing; +use Drupal\Component\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatch; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -85,7 +87,7 @@ public function getRawParameters() { /** * Returns the route match for the current request. * - * @return \Drupal\Core\Routing\RouteMatchInterface + * @return \Drupal\Component\Routing\RouteMatchInterface * The current route match object. */ protected function getCurrentRouteMatch() { @@ -98,7 +100,7 @@ protected function getCurrentRouteMatch() { * @param \Symfony\Component\HttpFoundation\Request $request * A request object. * - * @return \Drupal\Core\Routing\RouteMatchInterface + * @return \Drupal\Component\Routing\RouteMatchInterface * A route match object created from the request. */ protected function getRouteMatch(Request $request) { diff --git a/core/lib/Drupal/Core/Routing/NullRouteMatch.php b/core/lib/Drupal/Component/Routing/NullRouteMatch.php similarity index 90% rename from core/lib/Drupal/Core/Routing/NullRouteMatch.php rename to core/lib/Drupal/Component/Routing/NullRouteMatch.php index 0ef2c3b..8f9c44e 100644 --- a/core/lib/Drupal/Core/Routing/NullRouteMatch.php +++ b/core/lib/Drupal/Component/Routing/NullRouteMatch.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\Core\Routing\NullRouteMatch. + * Contains Drupal\Component\Routing\NullRouteMatch. */ -namespace Drupal\Core\Routing; +namespace Drupal\Component\Routing; use Symfony\Component\HttpFoundation\ParameterBag; diff --git a/core/lib/Drupal/Core/Routing/RouteMatch.php b/core/lib/Drupal/Component/Routing/RouteMatch.php similarity index 96% rename from core/lib/Drupal/Core/Routing/RouteMatch.php rename to core/lib/Drupal/Component/Routing/RouteMatch.php index eafb184..b497862 100644 --- a/core/lib/Drupal/Core/Routing/RouteMatch.php +++ b/core/lib/Drupal/Component/Routing/RouteMatch.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\Core\Routing\RouteMatch. + * Contains Drupal\Component\Routing\RouteMatch. */ -namespace Drupal\Core\Routing; +namespace Drupal\Component\Routing; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\ParameterBag; @@ -75,7 +75,7 @@ public function __construct($route_name, Route $route, array $parameters = array * @param Request $request * A request object. * - * @return \Drupal\Core\Routing\RouteMatchInterface + * @return \Drupal\Component\Routing\RouteMatchInterface * A new RouteMatch object if there's a matched route for the request. * A new NullRouteMatch object otherwise (e.g., on a 404 page or when * invoked prior to routing). diff --git a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php b/core/lib/Drupal/Component/Routing/RouteMatchInterface.php similarity index 95% rename from core/lib/Drupal/Core/Routing/RouteMatchInterface.php rename to core/lib/Drupal/Component/Routing/RouteMatchInterface.php index f0d9aa8..0d9e2b9 100644 --- a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php +++ b/core/lib/Drupal/Component/Routing/RouteMatchInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\Core\Routing\RouteMatchInterface. + * Contains Drupal\Component\Routing\RouteMatchInterface. */ -namespace Drupal\Core\Routing; +namespace Drupal\Component\Routing; /** * Provides an interface for classes representing the result of routing. diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php index c808ce6..aa086bc 100644 --- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php +++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Breadcrumb; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Defines an interface for classes that build breadcrumbs. @@ -17,7 +17,7 @@ /** * Whether this breadcrumb builder should be used to build the breadcrumb. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. * * @return bool @@ -29,7 +29,7 @@ public function applies(RouteMatchInterface $route_match); /** * Builds the breadcrumb. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. * * @return array diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php index 2c6ed49..df1c7ff 100644 --- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php +++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php @@ -9,7 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Extension\ModuleHandlerInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Provides a breadcrumb manager. diff --git a/core/lib/Drupal/Core/Cache/ThemeCacheContext.php b/core/lib/Drupal/Core/Cache/ThemeCacheContext.php index 5d0bd3e..9886e36 100644 --- a/core/lib/Drupal/Core/Cache/ThemeCacheContext.php +++ b/core/lib/Drupal/Core/Cache/ThemeCacheContext.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Cache; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; /** @@ -18,7 +18,7 @@ class ThemeCacheContext implements CacheContextInterface { /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatch + * @var \Drupal\Component\Routing\RouteMatch */ protected $routeMatch; @@ -32,7 +32,7 @@ class ThemeCacheContext implements CacheContextInterface { /** * Constructs a new ThemeCacheContext service. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The route match. * @param \Drupal\Core\Theme\ThemeNegotiatorInterface $theme_negotiator * The theme negotiator. diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 8556f9b..c011b68 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -11,7 +11,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Page\DefaultHtmlPageRenderer; -use Drupal\Core\Routing\RouteMatch; +use Drupal\Component\Routing\RouteMatch; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Site\MaintenanceModeInterface; diff --git a/core/lib/Drupal/Core/EventSubscriber/ThemeNegotiatorRequestSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ThemeNegotiatorRequestSubscriber.php index 322981d..d9a5d0d 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ThemeNegotiatorRequestSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ThemeNegotiatorRequestSubscriber.php @@ -7,7 +7,7 @@ namespace Drupal\Core\EventSubscriber; -use Drupal\Core\Routing\RouteMatch; +use Drupal\Component\Routing\RouteMatch; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\GetResponseEvent; diff --git a/core/lib/Drupal/Core/Site/MaintenanceMode.php b/core/lib/Drupal/Core/Site/MaintenanceMode.php index cac817c..aebd7a0 100644 --- a/core/lib/Drupal/Core/Site/MaintenanceMode.php +++ b/core/lib/Drupal/Core/Site/MaintenanceMode.php @@ -6,8 +6,7 @@ */ namespace Drupal\Core\Site; - -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\State\StateInterface; diff --git a/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php b/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php index 45c4457..409cbda 100644 --- a/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php +++ b/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Site; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; /** @@ -18,7 +18,7 @@ /** * Returns whether the site is in maintenance mode. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. * * @return bool diff --git a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php index b15ce93..86452d0 100644 --- a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php +++ b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php @@ -9,7 +9,7 @@ use Drupal\Core\Access\CsrfTokenGenerator; use Drupal\Core\Config\ConfigFactoryInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Symfony\Component\HttpFoundation\RequestStack; /** diff --git a/core/lib/Drupal/Core/Theme/DefaultNegotiator.php b/core/lib/Drupal/Core/Theme/DefaultNegotiator.php index 2f0e6f7..8f7b883 100644 --- a/core/lib/Drupal/Core/Theme/DefaultNegotiator.php +++ b/core/lib/Drupal/Core/Theme/DefaultNegotiator.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Theme; use Drupal\Core\Config\ConfigFactoryInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Determines the default theme of the site. diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php index 8c1ef03..e897759 100644 --- a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php +++ b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Provides a class which determines the active theme of the page. diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php b/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php index 673893e..6d5357f 100644 --- a/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php +++ b/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Defines an interface for classes which determine the active theme. @@ -30,7 +30,7 @@ /** * Whether this theme negotiator should be used to set the theme. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match object. * * @return bool @@ -42,7 +42,7 @@ public function applies(RouteMatchInterface $route_match); /** * Determine the active theme for the request. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match object. * * @return string|null diff --git a/core/modules/action/action.module b/core/modules/action/action.module index 8e11de1..fd5f472 100644 --- a/core/modules/action/action.module +++ b/core/modules/action/action.module @@ -5,7 +5,7 @@ * This is the Actions module for executing stored actions. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 64eb275..38bfb28 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -8,7 +8,7 @@ use Drupal\aggregator\Entity\Feed; use Drupal\aggregator\FeedInterface; use Drupal\Component\Utility\Xss; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Denotes that a feed's items should never expire. diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module index 2d048d4..5297418 100644 --- a/core/modules/ban/ban.module +++ b/core/modules/ban/ban.module @@ -5,7 +5,7 @@ * Allows to ban individual IP addresses. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/basic_auth/basic_auth.module b/core/modules/basic_auth/basic_auth.module index 9c09ce2..4beac18 100644 --- a/core/modules/basic_auth/basic_auth.module +++ b/core/modules/basic_auth/basic_auth.module @@ -5,7 +5,7 @@ * Provides an HTTP Basic authentication provider. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 9a4118d..1a75fe9 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -6,7 +6,7 @@ */ use Drupal\block\BlockInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\language\Entity\Language; use Drupal\system\Entity\Menu; diff --git a/core/modules/block/src/EventSubscriber/NodeRouteContext.php b/core/modules/block/src/EventSubscriber/NodeRouteContext.php index c1bd2bf..c8cc300 100644 --- a/core/modules/block/src/EventSubscriber/NodeRouteContext.php +++ b/core/modules/block/src/EventSubscriber/NodeRouteContext.php @@ -9,7 +9,7 @@ use Drupal\Core\Plugin\Context\Context; use Drupal\Core\Plugin\Context\ContextDefinition; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\node\Entity\Node; /** @@ -20,14 +20,14 @@ class NodeRouteContext extends BlockConditionContextSubscriberBase { /** * The route match object. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; /** * Constructs a new NodeRouteContext. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The route match object. */ public function __construct(RouteMatchInterface $route_match) { diff --git a/core/modules/block/src/Plugin/DisplayVariant/FullPageVariant.php b/core/modules/block/src/Plugin/DisplayVariant/FullPageVariant.php index 7243362..6dded9c 100644 --- a/core/modules/block/src/Plugin/DisplayVariant/FullPageVariant.php +++ b/core/modules/block/src/Plugin/DisplayVariant/FullPageVariant.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityViewBuilderInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Display\VariantBase; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -49,7 +49,7 @@ class FullPageVariant extends VariantBase implements ContainerFactoryPluginInter /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -73,7 +73,7 @@ class FullPageVariant extends VariantBase implements ContainerFactoryPluginInter * The block entity storage. * @param \Drupal\Core\Entity\EntityViewBuilderInterface $block_view_builder * The block view builder. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. * @param \Drupal\Core\Theme\ThemeNegotiatorInterface $theme_negotiator * The theme negotiator. diff --git a/core/modules/block/src/Theme/AdminDemoNegotiator.php b/core/modules/block/src/Theme/AdminDemoNegotiator.php index 50d88c3..fcd9266 100644 --- a/core/modules/block/src/Theme/AdminDemoNegotiator.php +++ b/core/modules/block/src/Theme/AdminDemoNegotiator.php @@ -7,7 +7,7 @@ namespace Drupal\block\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; /** diff --git a/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php b/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php index 9b45337..8680987 100644 --- a/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php +++ b/core/modules/block/tests/src/Plugin/DisplayVariant/FullPageVariantTest.php @@ -32,7 +32,7 @@ class FullPageVariantTest extends UnitTestCase { /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Component\Routing\RouteMatchInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $routeMatch; @@ -57,7 +57,7 @@ class FullPageVariantTest extends UnitTestCase { public function setUpDisplayVariant($configuration = array(), $definition = array()) { $this->blockStorage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface'); $this->blockViewBuilder = $this->getMock('Drupal\Core\Entity\EntityViewBuilderInterface'); - $this->routeMatch = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $this->routeMatch = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $this->themeNegotiator = $this->getMock('Drupal\Core\Theme\ThemeNegotiatorInterface'); return $this->getMockBuilder('Drupal\block\Plugin\DisplayVariant\FullPageVariant') ->setConstructorArgs(array($configuration, 'test', $definition, $this->blockStorage, $this->blockViewBuilder, $this->routeMatch, $this->themeNegotiator)) diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module index 706fa69..b88542d 100644 --- a/core/modules/block_content/block_content.module +++ b/core/modules/block_content/block_content.module @@ -5,7 +5,7 @@ * Allows the creation of custom blocks through the user interface. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldInstanceConfig; diff --git a/core/modules/book/book.module b/core/modules/book/book.module index ba00049..1faf22e 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -9,7 +9,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\node\NodeInterface; use Drupal\node\NodeTypeInterface; use Drupal\Core\Language\LanguageInterface; diff --git a/core/modules/book/src/BookBreadcrumbBuilder.php b/core/modules/book/src/BookBreadcrumbBuilder.php index fc48f90..2b3a603 100644 --- a/core/modules/book/src/BookBreadcrumbBuilder.php +++ b/core/modules/book/src/BookBreadcrumbBuilder.php @@ -11,7 +11,7 @@ use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Routing\LinkGeneratorTrait; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\node\NodeInterface; diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module index 6f69efc..3da1f22 100644 --- a/core/modules/breakpoint/breakpoint.module +++ b/core/modules/breakpoint/breakpoint.module @@ -8,7 +8,7 @@ use Drupal\breakpoint\Entity\Breakpoint; use Drupal\breakpoint\Entity\BreakpointGroup; use Drupal\Core\Config\Entity\ConfigEntityStorage; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module index 421da85..e12c85e 100644 --- a/core/modules/ckeditor/ckeditor.module +++ b/core/modules/ckeditor/ckeditor.module @@ -5,7 +5,7 @@ * Provides integration with the CKEditor WYSIWYG editor. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; /** diff --git a/core/modules/color/color.module b/core/modules/color/color.module index c82e8d1..12a28f0 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -8,7 +8,7 @@ use Drupal\Component\Utility\Bytes; use Drupal\Component\Utility\Environment; use Drupal\Component\Utility\String; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 7842654..2d898db 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -18,7 +18,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\entity\Entity\EntityViewDisplay; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Field\FieldDefinitionInterface; diff --git a/core/modules/comment/src/CommentBreadcrumbBuilder.php b/core/modules/comment/src/CommentBreadcrumbBuilder.php index 54f4d1f..6ebc189 100644 --- a/core/modules/comment/src/CommentBreadcrumbBuilder.php +++ b/core/modules/comment/src/CommentBreadcrumbBuilder.php @@ -9,7 +9,7 @@ use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Routing\LinkGeneratorTrait; use Drupal\Core\StringTranslation\StringTranslationTrait; diff --git a/core/modules/config/config.module b/core/modules/config/config.module index e22b71b..393795c 100644 --- a/core/modules/config/config.module +++ b/core/modules/config/config.module @@ -5,7 +5,7 @@ * Allows site administrators to modify configuration. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module index b128931..e9ff16a 100644 --- a/core/modules/config_translation/config_translation.module +++ b/core/modules/config_translation/config_translation.module @@ -7,7 +7,7 @@ use Drupal\config_translation\Plugin\Derivative\ConfigTranslationLocalTasks; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Symfony\Component\Routing\Exception\RouteNotFoundException; /** diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index e8485c1..d6ead3b 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -5,7 +5,7 @@ * Enables the use of personal and site-wide contact forms. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 858ffba..9fb16c9 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -10,7 +10,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Language\LanguageInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldInstanceConfig; use Drupal\field\FieldInstanceConfigInterface; use Drupal\node\NodeInterface; diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 2f69521..f77bcdc 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -7,7 +7,7 @@ use Drupal\Component\Serialization\Json; use Drupal\Component\Utility\UrlHelper; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; /** diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index b5f98dd..9ebf3b3 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -7,7 +7,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Datetime\DrupalDateTime; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; use Drupal\datetime\DateHelper; use Drupal\node\NodeInterface; diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index d6e20ff..7015e40 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -11,7 +11,7 @@ * @see watchdog() */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index 5aa7929..ff1c087 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -8,7 +8,7 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; use Drupal\Component\Utility\NestedArray; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module index d3590a1..c987aeb 100644 --- a/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -9,7 +9,7 @@ */ use Drupal\Core\Config\Entity\ConfigEntityStorage; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module index 48ffc92..1c7f2ef 100644 --- a/core/modules/entity_reference/entity_reference.module +++ b/core/modules/entity_reference/entity_reference.module @@ -10,7 +10,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldInstanceConfig; use Drupal\field\FieldConfigInterface; diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 5695f40..49523f6 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -9,7 +9,7 @@ use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Extension\Extension; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /* * Load all public Field API functions. Drupal currently has no diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 4fe550c..01c3e9c 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\entity\EntityViewModeInterface; use Drupal\field_ui\FieldUI; use Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask; diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 52a255a..a50ac58 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -8,7 +8,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\file\Entity\File; use Drupal\file\FileInterface; use Drupal\Component\Utility\NestedArray; diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 68b445e..a1c3f17 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -12,7 +12,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Cache\Cache; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Template\Attribute; use Drupal\filter\FilterFormatInterface; diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 23293fe..d46788c 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -10,7 +10,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Entity\EntityInterface; use Drupal\Component\Utility\String; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php index 05af222..c9cf9d5 100644 --- a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php +++ b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php @@ -10,7 +10,7 @@ use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Routing\LinkGeneratorTrait; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\forum\ForumManagerInterface; diff --git a/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php index 8f14417..db02c3d 100644 --- a/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php +++ b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php @@ -7,7 +7,7 @@ namespace Drupal\forum\Breadcrumb; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Provides a breadcrumb builder base class for forum listing pages. diff --git a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php index b4134d8..2167af0 100644 --- a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php +++ b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php @@ -7,7 +7,7 @@ namespace Drupal\forum\Breadcrumb; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Breadcrumb builder for forum nodes. diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php index ad5840b..b9705fb 100644 --- a/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php +++ b/core/modules/forum/tests/src/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php @@ -131,7 +131,7 @@ public function testBuild() { $property->setValue($breadcrumb_builder, $link_generator); // Our empty data set. - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); // Expected result set. $expected = array( diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php index e32e287..6e59a97 100644 --- a/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Breadcrumb/ForumListingBreadcrumbBuilderTest.php @@ -45,7 +45,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = arra ->setMethods(NULL) ->getMock(); - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $route_match->expects($this->once()) ->method('getRouteName') ->will($this->returnValue($route_name)); @@ -197,7 +197,7 @@ public function testBuild() { ->will($this->returnValue('You_should_not_see_this')); // Our data set. - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $route_match->expects($this->exactly(2)) ->method('getParameter') ->with('taxonomy_term') diff --git a/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php index 2cacbb0..b539041 100644 --- a/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php @@ -51,7 +51,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = arra ->setMethods(NULL) ->getMock(); - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $route_match->expects($this->once()) ->method('getRouteName') ->will($this->returnValue($route_name)); @@ -201,7 +201,7 @@ public function testBuild() { ->getMock(); // Our data set. - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $route_match->expects($this->exactly(2)) ->method('getParameter') ->with('node') diff --git a/core/modules/hal/hal.module b/core/modules/hal/hal.module index a6c915e..b245a4f 100644 --- a/core/modules/hal/hal.module +++ b/core/modules/hal/hal.module @@ -5,7 +5,7 @@ * Adds support for serializing entities to Hypertext Application Language. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/help/help.module b/core/modules/help/help.module index 3539660..dc40909 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -5,7 +5,7 @@ * Manages displaying online help. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php index 26a3160..ee216e5 100644 --- a/core/modules/help/src/Controller/HelpController.php +++ b/core/modules/help/src/Controller/HelpController.php @@ -8,7 +8,7 @@ namespace Drupal\help\Controller; use Drupal\Core\Controller\ControllerBase; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Drupal\Component\Utility\String; @@ -21,14 +21,14 @@ class HelpController extends ControllerBase { /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; /** * Creates a new HelpController. * - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(RouteMatchInterface $route_match) { diff --git a/core/modules/history/history.module b/core/modules/history/history.module index f4c9742..7576f15 100644 --- a/core/modules/history/history.module +++ b/core/modules/history/history.module @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Entities changed before this time are always shown as read. diff --git a/core/modules/image/image.module b/core/modules/image/image.module index 2ff2ecb..d3cff33 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Component\Plugin\Exception\PluginNotFoundException; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\file\Entity\File; use Drupal\field\FieldConfigInterface; use Drupal\field\FieldInstanceConfigInterface; diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 5ac331b..512b443 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -7,7 +7,7 @@ use Drupal\Core\PhpStorage\PhpStorageFactory; use Drupal\Core\Language\LanguageInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\language\ConfigurableLanguageManager; use Drupal\language\ConfigurableLanguageManagerInterface; use Drupal\language\Entity\Language as LanguageEntity; diff --git a/core/modules/link/link.module b/core/modules/link/link.module index d33181e..6ae1073 100644 --- a/core/modules/link/link.module +++ b/core/modules/link/link.module @@ -6,7 +6,7 @@ */ use Drupal\Component\Utility\String; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index ea0ec44..b620adc 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -15,7 +15,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Cache\Cache; use Drupal\Core\Language\Language; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslationWrapper; use Drupal\Core\Language\LanguageInterface; use Drupal\language\Entity\Language as LanguageEntity; diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index 8a2ce38..0195ee4 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -5,7 +5,7 @@ * Enables users to create menu links. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Url; use Drupal\menu_link\Entity\MenuLink; use Drupal\menu_link\MenuLinkInterface; diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 70b5b59..1fb9aa6 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\block\BlockPluginInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\node\NodeTypeInterface; use Drupal\system\Entity\Menu; use Symfony\Component\HttpFoundation\JsonResponse; diff --git a/core/modules/node/node.module b/core/modules/node/node.module index f23559e..36a3fb7 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -11,7 +11,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Url; use Symfony\Component\HttpFoundation\Response; use Drupal\Core\Database\Query\AlterableInterface; diff --git a/core/modules/options/options.module b/core/modules/options/options.module index d9a1b24..ec316ff 100644 --- a/core/modules/options/options.module +++ b/core/modules/options/options.module @@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException; use Drupal\field\FieldConfigInterface; use Drupal\field\FieldConfigUpdateForbiddenException; diff --git a/core/modules/path/path.module b/core/modules/path/path.module index 8721d5e..10ccf0a 100644 --- a/core/modules/path/path.module +++ b/core/modules/path/path.module @@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Field\FieldDefinition; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/quickedit/quickedit.module b/core/modules/quickedit/quickedit.module index f02fe3d..796f8ac 100644 --- a/core/modules/quickedit/quickedit.module +++ b/core/modules/quickedit/quickedit.module @@ -13,7 +13,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index 1221147..6ee110c 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -6,7 +6,7 @@ */ use Drupal\Component\Utility\String; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; /** diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module index 79e29e2..3ebb8b4 100644 --- a/core/modules/responsive_image/responsive_image.module +++ b/core/modules/responsive_image/responsive_image.module @@ -6,7 +6,7 @@ */ use Drupal\breakpoint\Entity\Breakpoint; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use \Drupal\Core\Template\Attribute; /** diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module index c0c6be3..40b9f34 100644 --- a/core/modules/rest/rest.module +++ b/core/modules/rest/rest.module @@ -5,7 +5,7 @@ * RESTful web services module. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_permission(). diff --git a/core/modules/search/search.module b/core/modules/search/search.module index 6c041d0..6950364 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -7,7 +7,7 @@ use Drupal\Component\Utility\String; use Drupal\Component\Utility\Unicode; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Matches all 'N' Unicode character classes (numbers) diff --git a/core/modules/serialization/serialization.module b/core/modules/serialization/serialization.module index a6693aa..7383244 100644 --- a/core/modules/serialization/serialization.module +++ b/core/modules/serialization/serialization.module @@ -5,7 +5,7 @@ * Provides a service for (de)serializing data to/from formats such as JSON and XML. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index e433c82..e6a2cdd 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -7,7 +7,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\UrlHelper; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Routing\UrlMatcher; use Drupal\Core\Url; use Drupal\shortcut\Entity\ShortcutSet; diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php index ec3180c..314d704 100644 --- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php +++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php @@ -10,7 +10,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Access\AccessInterface; use Drupal\Core\Form\FormBase; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\shortcut\Entity\ShortcutSet; use Drupal\shortcut\ShortcutSetStorageInterface; use Drupal\user\UserInterface; @@ -38,7 +38,7 @@ class SwitchShortcutSet extends FormBase { /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -47,7 +47,7 @@ class SwitchShortcutSet extends FormBase { * * @param \Drupal\shortcut\ShortcutSetStorageInterface $shortcut_set_storage * The shortcut set storage. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(ShortcutSetStorageInterface $shortcut_set_storage, RouteMatchInterface $route_match) { diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 1144e9d..ec68fbd 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -4,7 +4,7 @@ use Drupal\Core\Page\HtmlPage; use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\simpletest\TestBase; use Drupal\simpletest\TestDiscovery; use Symfony\Component\Process\PhpExecutableFinder; diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index fbcf702..6580e69 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\node\NodeInterface; /** diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module index 4165fab..1d12227 100644 --- a/core/modules/syslog/syslog.module +++ b/core/modules/syslog/syslog.module @@ -5,7 +5,7 @@ * Redirects logging messages to syslog. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php index da1ecd0..fb1a63b 100644 --- a/core/modules/system/src/Form/ModulesListForm.php +++ b/core/modules/system/src/Form/ModulesListForm.php @@ -17,7 +17,7 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Access\AccessManager; @@ -70,7 +70,7 @@ class ModulesListForm extends FormBase { /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -104,7 +104,7 @@ public static function create(ContainerInterface $container) { * The entity query factory. * @param \Drupal\Core\Session\AccountInterface $current_user * The current user. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, AccessManager $access_manager, EntityManagerInterface $entity_manager, QueryFactory $query_factory, AccountInterface $current_user, RouteMatchInterface $route_match) { diff --git a/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/core/modules/system/src/PathBasedBreadcrumbBuilder.php index 68bf38b..40c877b 100644 --- a/core/modules/system/src/PathBasedBreadcrumbBuilder.php +++ b/core/modules/system/src/PathBasedBreadcrumbBuilder.php @@ -13,7 +13,7 @@ use Drupal\Core\Access\AccessManager; use Drupal\Core\ParamConverter\ParamNotConvertedException; use Drupal\Core\PathProcessor\InboundPathProcessorInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Routing\LinkGeneratorTrait; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; diff --git a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php index 2201ebb..fb6919a 100644 --- a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php @@ -10,7 +10,7 @@ use Drupal\block\BlockBase; use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -33,7 +33,7 @@ class SystemBreadcrumbBlock extends BlockBase implements ContainerFactoryPluginI /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -48,7 +48,7 @@ class SystemBreadcrumbBlock extends BlockBase implements ContainerFactoryPluginI * The plugin implementation definition. * @param \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface $breadcrumb_manager * The breadcrumb manager. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, BreadcrumbBuilderInterface $breadcrumb_manager, RouteMatchInterface $route_match) { diff --git a/core/modules/system/src/Plugin/Block/SystemHelpBlock.php b/core/modules/system/src/Plugin/Block/SystemHelpBlock.php index c9de381..b6e0df7 100644 --- a/core/modules/system/src/Plugin/Block/SystemHelpBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemHelpBlock.php @@ -10,7 +10,7 @@ use Drupal\block\BlockBase; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -49,7 +49,7 @@ class SystemHelpBlock extends BlockBase implements ContainerFactoryPluginInterfa /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -66,7 +66,7 @@ class SystemHelpBlock extends BlockBase implements ContainerFactoryPluginInterfa * The current request. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, Request $request, ModuleHandlerInterface $module_handler, RouteMatchInterface $route_match) { diff --git a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php index 874bcd6..558bfff 100644 --- a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php +++ b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php @@ -10,7 +10,7 @@ use Drupal\Core\Condition\ConditionPluginBase; use Drupal\Core\Extension\ThemeHandlerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -41,7 +41,7 @@ class CurrentThemeCondition extends ConditionPluginBase implements ContainerFact /** * The current route match. * - * @var \Drupal\Core\Routing\RouteMatchInterface + * @var \Drupal\Component\Routing\RouteMatchInterface */ protected $routeMatch; @@ -58,7 +58,7 @@ class CurrentThemeCondition extends ConditionPluginBase implements ContainerFact * The theme negotiator. * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler * The theme handler. - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, ThemeNegotiatorInterface $theme_negotiator, ThemeHandlerInterface $theme_handler, RouteMatchInterface $route_match) { diff --git a/core/modules/system/src/Theme/BatchNegotiator.php b/core/modules/system/src/Theme/BatchNegotiator.php index b8e1d47..c6b7de3 100644 --- a/core/modules/system/src/Theme/BatchNegotiator.php +++ b/core/modules/system/src/Theme/BatchNegotiator.php @@ -8,7 +8,7 @@ namespace Drupal\system\Theme; use Drupal\Core\Batch\BatchStorageInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; use Symfony\Component\HttpFoundation\RequestStack; diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 8ff4b54..b36f3e1 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -903,7 +903,7 @@ function hook_module_implements_alter(&$implementations, $hook) { * @code * array('Home'); * @endcode - * @param \Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. * @param array $context * May include the following key: @@ -911,7 +911,7 @@ function hook_module_implements_alter(&$implementations, $hook) { * \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface that constructed this * breadcrumb, or NULL if no builder acted based on the current attributes. */ -function hook_system_breadcrumb_alter(array &$breadcrumb, \Drupal\Core\Routing\RouteMatchInterface $route_match, array $context) { +function hook_system_breadcrumb_alter(array &$breadcrumb, \Drupal\Component\Routing\RouteMatchInterface $route_match, array $context) { // Add an item to the end of the breadcrumb. $breadcrumb[] = Drupal::l(t('Text'), 'example_route_name'); } @@ -1010,14 +1010,14 @@ function hook_permission() { * For page-specific help, use the route name as identified in the * module's routing.yml file. For module overview help, the route name * will be in the form of "help.page.$modulename". - * @param Drupal\Core\Routing\RouteMatchInterface $route_match + * @param \Drupal\Component\Routing\RouteMatchInterface $route_match * The current route match. This can be used to generate different help * output for different pages that share the same route. * * @return string * A localized string containing the help text. */ -function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_match) { +function hook_help($route_name, \Drupal\Component\Routing\RouteMatchInterface $route_match) { switch ($route_name) { // Main module help for the block module. case 'help.page.block': diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 74fc69b..0632de0 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -8,7 +8,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Extension\Extension; use Drupal\Core\Extension\ExtensionDiscovery; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslationWrapper; use Drupal\Core\Language\LanguageInterface; use Drupal\block\BlockPluginInterface; diff --git a/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php b/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php index 3d3a17e..d532c92 100644 --- a/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php +++ b/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php @@ -7,7 +7,7 @@ namespace Drupal\menu_test\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; /** diff --git a/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php b/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php index e95f57c..bb56374 100644 --- a/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php +++ b/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php @@ -7,7 +7,7 @@ namespace Drupal\theme_test\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; /** diff --git a/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php b/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php index 8d93267..9ab8ea2 100644 --- a/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php +++ b/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php @@ -7,7 +7,7 @@ namespace Drupal\theme_test\Theme; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; /** diff --git a/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php index 81edaa2..26374b1 100644 --- a/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php +++ b/core/modules/system/tests/src/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php @@ -125,7 +125,7 @@ public function testBuildOnFrontpage() { ->method('getPathInfo') ->will($this->returnValue('/')); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(), $links); } @@ -141,7 +141,7 @@ public function testBuildWithOnePathElement() { $this->setupLinkGeneratorWithFrontpage(); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(0 => 'Home'), $links); } @@ -183,7 +183,7 @@ public function testBuildWithTwoPathElements() { ->will($this->returnValue($link_front)); $this->setupAccessManagerWithTrue(); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(0 => 'Home', 1 => $link_example), $links); } @@ -239,7 +239,7 @@ public function testBuildWithThreePathElements() { ->will($this->returnValue($link_front)); $this->setupAccessManagerWithTrue(); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(0 => 'Home', 1 => $link_example, 2 => $link_example_bar), $links); } @@ -262,7 +262,7 @@ public function testBuildWithException($exception_class, $exception_argument) { ->will($this->throwException(new $exception_class($exception_argument))); $this->setupLinkGeneratorWithFrontpage(); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); // No path matched, though at least the frontpage is displayed. $this->assertEquals(array(0 => 'Home'), $links); @@ -304,7 +304,7 @@ public function testBuildWithNonProcessedPath() { ->will($this->returnValue(array())); $this->setupLinkGeneratorWithFrontpage(); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); // No path matched, though at least the frontpage is displayed. $this->assertEquals(array(0 => 'Home'), $links); @@ -316,7 +316,7 @@ public function testBuildWithNonProcessedPath() { * @covers ::applies() */ public function testApplies() { - $this->assertTrue($this->builder->applies($this->getMock('Drupal\Core\Routing\RouteMatchInterface'))); + $this->assertTrue($this->builder->applies($this->getMock('Drupal\Component\Routing\RouteMatchInterface'))); } /** @@ -362,7 +362,7 @@ public function testBuildWithUserPath() { ->with($this->anything(), $route_1) ->will($this->returnValue('Admin')); - $links = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $links = $this->builder->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(0 => 'Home', 1 => $link_user), $links); } diff --git a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php index a14041b..1c1b681 100644 --- a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php +++ b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy; use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Routing\LinkGeneratorTrait; use Drupal\Core\StringTranslation\StringTranslationTrait; diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 56ec514..fef6159 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityDatabaseStorage; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Url; use Drupal\file\FileInterface; use Drupal\node\Entity\Node; diff --git a/core/modules/telephone/telephone.module b/core/modules/telephone/telephone.module index 6c5d524..0e088ac 100644 --- a/core/modules/telephone/telephone.module +++ b/core/modules/telephone/telephone.module @@ -5,7 +5,7 @@ * Defines a simple telephone number field type. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/text/text.module b/core/modules/text/text.module index 1612487..3dc1388 100644 --- a/core/modules/text/text.module +++ b/core/modules/text/text.module @@ -7,7 +7,7 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index c803872..2f06dd3 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -7,7 +7,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; use Drupal\Component\Datetime\DateTimePlus; use Drupal\Component\Utility\Crypt; diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module index 001acaf..904ceb0 100644 --- a/core/modules/tour/tour.module +++ b/core/modules/tour/tour.module @@ -6,7 +6,7 @@ */ use Drupal\Core\Cache\CacheBackendInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index 1c41d50..1efe981 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\comment\CommentInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\node\NodeInterface; use Drupal\Core\Session\AccountInterface; diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 1dbfcf9..ade8bd7 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -11,7 +11,7 @@ * ability to install contributed modules and themes via an user interface. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Site\Settings; use Symfony\Cmf\Component\Routing\RouteObjectInterface; diff --git a/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php index f6aee69..37e682e 100644 --- a/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php @@ -7,7 +7,7 @@ namespace Drupal\user\EventSubscriber; -use Drupal\Core\Routing\RouteMatch; +use \Drupal\Component\Routing\RouteMatch; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Site\MaintenanceModeInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/core/modules/user/src/Theme/AdminNegotiator.php b/core/modules/user/src/Theme/AdminNegotiator.php index 9bb942a..9580b8d 100644 --- a/core/modules/user/src/Theme/AdminNegotiator.php +++ b/core/modules/user/src/Theme/AdminNegotiator.php @@ -10,7 +10,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Routing\AdminContext; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Theme\ThemeNegotiatorInterface; diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 32c2571..0744955 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -4,7 +4,7 @@ use Drupal\Component\Utility\String; use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AnonymousUserSession; use \Drupal\Core\Entity\Display\EntityViewDisplayInterface; diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 745d397..193d4e3 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -14,7 +14,7 @@ use Drupal\Core\Database\Query\AlterableInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\views\Plugin\Derivative\ViewsLocalTask; use Drupal\Core\Template\AttributeArray; use Drupal\views\ViewExecutable; diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 910e4be..0964b9a 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -5,7 +5,7 @@ * Provide structure for the administrative interface to Views. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\views\Views; use Drupal\views\ViewExecutable; use Drupal\views\ViewStorageInterface; diff --git a/core/modules/xmlrpc/xmlrpc.module b/core/modules/xmlrpc/xmlrpc.module index 21fafe1..eb3a7ec 100644 --- a/core/modules/xmlrpc/xmlrpc.module +++ b/core/modules/xmlrpc/xmlrpc.module @@ -5,7 +5,7 @@ * Enables XML-RPC functionality. */ -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; /** * Implements hook_help(). diff --git a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php b/core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php similarity index 90% rename from core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php rename to core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php index 3293b84..2e1e785 100644 --- a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php +++ b/core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php @@ -2,14 +2,12 @@ /** * @file - * Contains Drupal\Tests\Core\Routing\RouteMatchTest. + * Contains Drupal\Tests\Component\Routing\RouteMatchTest. */ -namespace Drupal\Tests\Core\Routing; +namespace Drupal\Tests\Component\Routing; -use Drupal\Core\Routing\CurrentRouteMatch; -use Drupal\Core\Routing\RouteMatch; -use Drupal\Tests\UnitTestCase; +use Drupal\Component\Routing\CurrentRouteMatch; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; @@ -17,7 +15,7 @@ use Symfony\Component\Routing\Route; /** - * @coversDefaultClass \Drupal\Core\Routing\CurrentRouteMatch + * @coversDefaultClass \Drupal\Component\Routing\CurrentRouteMatch * @group Routing */ class CurrentRouteMatchTest extends RouteMatchBaseTest { diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchBaseTest.php b/core/tests/Drupal/Tests/Component/Routing/RouteMatchBaseTest.php similarity index 90% rename from core/tests/Drupal/Tests/Core/Routing/RouteMatchBaseTest.php rename to core/tests/Drupal/Tests/Component/Routing/RouteMatchBaseTest.php index 57b03e3..ab61a96 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchBaseTest.php +++ b/core/tests/Drupal/Tests/Component/Routing/RouteMatchBaseTest.php @@ -2,12 +2,12 @@ /** * @file - * Contains Drupal\Tests\Core\Routing\RouteMatchTest. + * Contains Drupal\Tests\Component\Routing\RouteMatchTest. */ -namespace Drupal\Tests\Core\Routing; +namespace Drupal\Tests\Component\Routing; -use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Component\Routing\RouteMatchInterface; use Drupal\Tests\UnitTestCase; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\ParameterBag; @@ -30,7 +30,7 @@ * Parameters array * @param $raw_parameters * Raw parameters array - * @return \Drupal\Core\Routing\RouteMatchInterface + * @return \Drupal\Component\Routing\RouteMatchInterface */ abstract protected function getRouteMatch($name, Route $route, array $parameters, array $raw_parameters); @@ -102,7 +102,7 @@ public function testGetRouteObject(RouteMatchInterface $route_match, Route $rout /** * @covers ::getParameter - * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames + * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames * @dataProvider routeMatchProvider */ public function testGetParameter(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) { @@ -116,7 +116,7 @@ public function testGetParameter(RouteMatchInterface $route_match, Route $route, /** * @covers ::getParameters - * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames + * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames * @dataProvider routeMatchProvider */ public function testGetParameters(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) { @@ -125,7 +125,7 @@ public function testGetParameters(RouteMatchInterface $route_match, Route $route /** * @covers ::getRawParameter - * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames + * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames * @dataProvider routeMatchProvider */ public function testGetRawParameter(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) { @@ -139,7 +139,7 @@ public function testGetRawParameter(RouteMatchInterface $route_match, Route $rou /** * @covers ::getRawParameters - * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames + * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames * @dataProvider routeMatchProvider */ public function testGetRawParameters(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) { diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php similarity index 91% rename from core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php rename to core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php index 6aab6f4..87a1e69 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php +++ b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php @@ -2,20 +2,19 @@ /** * @file - * Contains Drupal\Tests\Core\Routing\RouteMatchTest. + * Contains Drupal\Tests\Component\Routing\RouteMatchTest. */ -namespace Drupal\Tests\Core\Routing; +namespace Drupal\Tests\Component\Routing; -use Drupal\Core\Routing\RouteMatch; -use Drupal\Tests\UnitTestCase; +use Drupal\Component\Routing\RouteMatch; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; /** - * @coversDefaultClass \Drupal\Core\Routing\RouteMatch + * @coversDefaultClass \Drupal\Component\Routing\RouteMatch * @group Routing */ class RouteMatchTest extends RouteMatchBaseTest { diff --git a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php index a2cbbf0..d41d918 100644 --- a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php @@ -42,7 +42,7 @@ protected function setUp() { * Tests the breadcrumb manager without any set breadcrumb. */ public function testBuildWithoutBuilder() { - $result = $this->breadcrumbManager->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $result = $this->breadcrumbManager->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); $this->assertEquals(array(), $result); } @@ -61,7 +61,7 @@ public function testBuildWithSingleBuilder() { ->method('build') ->will($this->returnValue($breadcrumb)); - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $this->moduleHandler->expects($this->once()) ->method('alter') ->with('system_breadcrumb', $breadcrumb, $route_match, array('builder' => $builder)); @@ -91,7 +91,7 @@ public function testBuildWithMultipleApplyingBuilders() { ->method('build') ->will($this->returnValue($breadcrumb2)); - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $this->moduleHandler->expects($this->once()) ->method('alter') @@ -124,7 +124,7 @@ public function testBuildWithOneNotApplyingBuilders() { ->method('build') ->will($this->returnValue($breadcrumb2)); - $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface'); + $route_match = $this->getMock('Drupal\Component\Routing\RouteMatchInterface'); $this->moduleHandler->expects($this->once()) ->method('alter') @@ -152,7 +152,7 @@ public function testBuildWithInvalidBreadcrumbResult() { ->will($this->returnValue('invalid_result')); $this->breadcrumbManager->addBuilder($builder, 0); - $this->breadcrumbManager->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface')); + $this->breadcrumbManager->build($this->getMock('Drupal\Component\Routing\RouteMatchInterface')); } } diff --git a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php index 91f3a61..fe382d0 100644 --- a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php +++ b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\Theme; -use Drupal\Core\Routing\RouteMatch; +use Drupal\Component\Routing\RouteMatch; use Drupal\Core\Theme\ThemeNegotiator; use Drupal\Tests\UnitTestCase; use Symfony\Component\HttpFoundation\Request;