diff --git a/core/core.services.yml b/core/core.services.yml index 7007138..0663018 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -382,12 +382,12 @@ services: class: Drupal\Core\PrivateKey arguments: ['@state'] csrf_token: - class: Drupal\Core\Access\CsrfTokenGenerator + class: Drupal\Core\Routing\Access\CsrfTokenGenerator arguments: ['@private_key'] calls: - [setRequest, ['@?request']] access_manager: - class: Drupal\Core\Access\AccessManager + class: Drupal\Core\Routing\Access\AccessManager arguments: ['@router.route_provider', '@url_generator', '@paramconverter_manager'] calls: - [setContainer, ['@service_container']] @@ -398,7 +398,7 @@ services: - { name: event_subscriber } arguments: ['@access_manager'] access_check.default: - class: Drupal\Core\Access\DefaultAccessCheck + class: Drupal\Core\Routing\Access\DefaultAccessCheck tags: - { name: access_check } access_check.entity: diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index 0d100df..a14a63f 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -530,7 +530,7 @@ public static function languageManager() { /** * Returns the CSRF token manager service. * - * @return \Drupal\Core\Access\CsrfTokenGenerator + * @return \Drupal\Core\Routing\Access\CsrfTokenGenerator * The CSRF token manager. */ public static function csrfToken() { diff --git a/core/lib/Drupal/Core/Access/AccessInterface.php b/core/lib/Drupal/Core/Access/AccessInterface.php index f555ecb..8ed4a20 100644 --- a/core/lib/Drupal/Core/Access/AccessInterface.php +++ b/core/lib/Drupal/Core/Access/AccessInterface.php @@ -7,9 +7,6 @@ namespace Drupal\Core\Access; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Route; - /** * An access check service determines access rules for particular routes. */ @@ -18,16 +15,14 @@ /** * Grant access. * - * A checker should return this value to indicate that it grants access to a - * route. + * A checker should return this value to indicate that it grants access. */ const ALLOW = TRUE; /** * Deny access. * - * A checker should return this value to indicate it does not grant access to - * a route. + * A checker should return this value to indicate it does not grant access. */ const DENY = NULL; @@ -35,24 +30,9 @@ * Block access. * * A checker should return this value to indicate that it wants to completely - * block access to this route, regardless of any other access checkers. Most - * checkers should prefer DENY. + * block access, regardless of any other access checkers. Most checkers should + * prefer DENY. */ const KILL = FALSE; - /** - * Checks for access to a route. - * - * @param \Symfony\Component\Routing\Route $route - * The route to check against. - * @param \Symfony\Component\HttpFoundation\Request $request - * The request object. - * - * @return mixed - * TRUE if access is allowed. - * FALSE if not. - * NULL if no opinion. - */ - public function access(Route $route, Request $request); - } diff --git a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php index 281fb09..00d9206 100644 --- a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php +++ b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php @@ -10,7 +10,7 @@ use Drupal\Core\Entity\EntityInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; /** * Provides a generic access checker for entities. @@ -25,7 +25,7 @@ public function appliesTo() { } /** - * Implements \Drupal\Core\Access\AccessCheckInterface::access(). + * Implements \Drupal\Core\Routing\Access\AccessCheckInterface::access(). * * The value of the '_entity_access' key must be in the pattern * 'entity_type.operation.' The entity type must match the {entity_type} diff --git a/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php index 5314e7a..8b7d88b 100644 --- a/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php +++ b/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Entity; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php index 6f18839..26ade57 100644 --- a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php @@ -13,7 +13,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Drupal\Core\Routing\RoutingEvents; -use Drupal\Core\Access\AccessManager; +use Drupal\Core\Routing\Access\AccessManager; use Drupal\Core\Routing\RouteBuildEvent; /** @@ -24,7 +24,7 @@ class AccessSubscriber implements EventSubscriberInterface { /** * Constructs a new AccessSubscriber. * - * @param \Drupal\Core\Access\AccessManager $access_manager + * @param \Drupal\Core\Routing\Access\AccessManager $access_manager * The access check manager that will be responsible for applying * AccessCheckers against routes. */ diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php index f1139fe..1a0d974 100644 --- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php +++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Menu; use Drupal\Component\Plugin\Exception\PluginException; -use Drupal\Core\Access\AccessManager; +use Drupal\Core\Routing\Access\AccessManager; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Controller\ControllerResolverInterface; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -84,7 +84,7 @@ class LocalTaskManager extends DefaultPluginManager { /** * The access manager. * - * @var \Drupal\Core\Access\AccessManager + * @var \Drupal\Core\Routing\Access\AccessManager */ protected $accessManager; @@ -103,7 +103,7 @@ class LocalTaskManager extends DefaultPluginManager { * The cache backend. * @param \Drupal\Core\Language\LanguageManager $language_manager * The language manager. - * @param \Drupal\Core\Access\AccessManager $access_manager + * @param \Drupal\Core\Routing\Access\AccessManager $access_manager * The access manager. */ public function __construct(ControllerResolverInterface $controller_resolver, Request $request, RouteProviderInterface $route_provider, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManager $language_manager, AccessManager $access_manager) { diff --git a/core/lib/Drupal/Core/Access/AccessCheckInterface.php b/core/lib/Drupal/Core/Routing/Access/AccessCheckInterface.php similarity index 84% rename from core/lib/Drupal/Core/Access/AccessCheckInterface.php rename to core/lib/Drupal/Core/Routing/Access/AccessCheckInterface.php index 3efc77f..a79738e 100644 --- a/core/lib/Drupal/Core/Access/AccessCheckInterface.php +++ b/core/lib/Drupal/Core/Routing/Access/AccessCheckInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\Core\Access\AccessCheckInterface. + * Contains Drupal\Core\Routing\Access\AccessCheckInterface. */ -namespace Drupal\Core\Access; +namespace Drupal\Core\Routing\Access; use Symfony\Component\Routing\Route; diff --git a/core/lib/Drupal/Core/Routing/Access/AccessInterface.php b/core/lib/Drupal/Core/Routing/Access/AccessInterface.php new file mode 100644 index 0000000..5232013 --- /dev/null +++ b/core/lib/Drupal/Core/Routing/Access/AccessInterface.php @@ -0,0 +1,34 @@ +checks[$service_id], 'Drupal\Core\Access\StaticAccessCheckInterface')) { + if (is_subclass_of($this->checks[$service_id], 'Drupal\Core\Routing\Access\StaticAccessCheckInterface')) { foreach ((array) $this->checks[$service_id]->appliesTo() as $key) { $this->staticRequirementMap[$key][] = $service_id; } diff --git a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php b/core/lib/Drupal/Core/Routing/Access/CsrfTokenGenerator.php similarity index 95% rename from core/lib/Drupal/Core/Access/CsrfTokenGenerator.php rename to core/lib/Drupal/Core/Routing/Access/CsrfTokenGenerator.php index 910a77b..3a2aba4 100644 --- a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php +++ b/core/lib/Drupal/Core/Routing/Access/CsrfTokenGenerator.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Core\Access\CsrfTokenGenerator. + * Contains \Drupal\Core\Routing\Access\CsrfTokenGenerator. */ -namespace Drupal\Core\Access; +namespace Drupal\Core\Routing\Access; use Drupal\Component\Utility\Crypt; use Drupal\Core\PrivateKey; diff --git a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php b/core/lib/Drupal/Core/Routing/Access/DefaultAccessCheck.php similarity index 87% rename from core/lib/Drupal/Core/Access/DefaultAccessCheck.php rename to core/lib/Drupal/Core/Routing/Access/DefaultAccessCheck.php index 46f8a63..4620f86 100644 --- a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php +++ b/core/lib/Drupal/Core/Routing/Access/DefaultAccessCheck.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\Core\Access\DefaultAccessCheck. + * Contains Drupal\Core\Routing\Access\DefaultAccessCheck. */ -namespace Drupal\Core\Access; +namespace Drupal\Core\Routing\Access; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/lib/Drupal/Core/Access/StaticAccessCheckInterface.php b/core/lib/Drupal/Core/Routing/Access/StaticAccessCheckInterface.php similarity index 89% rename from core/lib/Drupal/Core/Access/StaticAccessCheckInterface.php rename to core/lib/Drupal/Core/Routing/Access/StaticAccessCheckInterface.php index 9a7bb5d..634bf07 100644 --- a/core/lib/Drupal/Core/Access/StaticAccessCheckInterface.php +++ b/core/lib/Drupal/Core/Routing/Access/StaticAccessCheckInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Core\Access\StaticAccessCheckInterface. + * Contains \Drupal\Core\Routing\Access\StaticAccessCheckInterface. */ -namespace Drupal\Core\Access; +namespace Drupal\Core\Routing\Access; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/lib/Drupal/Core/Theme/ThemeAccessCheck.php b/core/lib/Drupal/Core/Theme/ThemeAccessCheck.php index 90e4a79..251259b 100644 --- a/core/lib/Drupal/Core/Theme/ThemeAccessCheck.php +++ b/core/lib/Drupal/Core/Theme/ThemeAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Theme; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php index 32a0aa1..5f76f57 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\aggregator\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Drupal\Core\Database\Connection; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php b/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php index ccf343c..da5b0d6 100644 --- a/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php +++ b/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php @@ -8,7 +8,7 @@ namespace Drupal\book\Access; use Drupal\book\BookManager; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php index 137def5..5c800aa 100644 --- a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php +++ b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php @@ -9,7 +9,7 @@ use Drupal\comment\CommentInterface; use Drupal\comment\Entity\Comment; -use Drupal\Core\Access\CsrfTokenGenerator; +use Drupal\Core\Routing\Access\CsrfTokenGenerator; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Node\NodeInterface; @@ -39,7 +39,7 @@ class CommentController extends ControllerBase implements ContainerInjectionInte /** * The CSRF token manager service. * - * @var \Drupal\Core\Access\CsrfTokenGenerator + * @var \Drupal\Core\Routing\Access\CsrfTokenGenerator */ protected $csrfToken; @@ -55,7 +55,7 @@ class CommentController extends ControllerBase implements ContainerInjectionInte * * @param \Symfony\Component\HttpKernel\HttpKernelInterface $httpKernel * HTTP kernel to handle requests. - * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token + * @param \Drupal\Core\Routing\Access\CsrfTokenGenerator $csrf_token * The CSRF token manager service. * @param \Drupal\Core\Session\AccountInterface $current_user * The current user service. diff --git a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php index 0bfee5c..a177605 100644 --- a/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php +++ b/core/modules/contact/lib/Drupal/contact/Access/ContactPageAccess.php @@ -7,7 +7,7 @@ namespace Drupal\contact\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Drupal\Core\Config\ConfigFactory; use Drupal\user\UserDataInterface; use Symfony\Component\Routing\Route; diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php index 3a53710..8d2ad1d 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php @@ -8,7 +8,7 @@ namespace Drupal\content_translation\Access; use Drupal\Core\Entity\EntityManager; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Drupal\Core\Language\Language; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationOverviewAccess.php b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationOverviewAccess.php index 116e9c5..2d7638e 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationOverviewAccess.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationOverviewAccess.php @@ -8,7 +8,7 @@ namespace Drupal\content_translation\Access; use Drupal\Core\Entity\EntityManager; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php index 95c7ba2..f9601a8 100644 --- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php +++ b/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\edit\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php index 3a77f73..878d0fd 100644 --- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php +++ b/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\edit\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Drupal\edit\Access\EditEntityFieldAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php index de50fbf..fc295e8 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php @@ -9,7 +9,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Drupal\edit\Access\EditEntityAccessCheck; use Drupal\Tests\UnitTestCase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php index 962b9ed..885f143 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php @@ -9,7 +9,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Drupal\edit\Access\EditEntityFieldAccessCheck; use Drupal\Tests\UnitTestCase; use Drupal\field\FieldInterface; diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php index 928b12f..dd144d3 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\field_ui\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php index a431da2..5534357 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\field_ui\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php b/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php index 368aa97..0b14b95 100644 --- a/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php +++ b/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php @@ -7,7 +7,7 @@ namespace Drupal\filter\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php index c44e1f6..1fec947 100644 --- a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php +++ b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\node\Access; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityManager; use Drupal\Core\Session\AccountInterface; diff --git a/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php b/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php index 9e42716..032e888 100644 --- a/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php +++ b/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\overlay\Access; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php b/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php index e96e6f7..9ce91f4 100644 --- a/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php +++ b/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\rest\Access; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/search/lib/Drupal/search/Access/SearchAccessCheck.php b/core/modules/search/lib/Drupal/search/Access/SearchAccessCheck.php index fb9a74e..fe043c4 100644 --- a/core/modules/search/lib/Drupal/search/Access/SearchAccessCheck.php +++ b/core/modules/search/lib/Drupal/search/Access/SearchAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\search\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Drupal\search\SearchPluginManager; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php index 85e48b2..79b5696 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\shortcut\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetEditAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetEditAccessCheck.php index 7ca4b01..1d081ae 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetEditAccessCheck.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetEditAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\shortcut\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetSwitchAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetSwitchAccessCheck.php index aacecc4..0bd3833 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetSwitchAccessCheck.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutSetSwitchAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\shortcut\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php b/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php index ccff863..2dbbc75 100644 --- a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php +++ b/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\system\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php index f2cc4d9..4129aed 100644 --- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php +++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\router_test\Access; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php index 422bd26..88aa79e 100644 --- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php +++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\router_test\Access; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php b/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php index 131bc6a..a1704a8 100644 --- a/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php +++ b/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php @@ -7,7 +7,7 @@ namespace Drupal\toolbar\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/translation/lib/Drupal/translation/Access/TranslationNodeOverviewAccessCheck.php b/core/modules/translation/lib/Drupal/translation/Access/TranslationNodeOverviewAccessCheck.php index 3b54fe1..98da36e 100644 --- a/core/modules/translation/lib/Drupal/translation/Access/TranslationNodeOverviewAccessCheck.php +++ b/core/modules/translation/lib/Drupal/translation/Access/TranslationNodeOverviewAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\translation\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php index adc04c8..1b02577 100644 --- a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php +++ b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php @@ -8,7 +8,7 @@ namespace Drupal\update\Access; use Drupal\Component\Utility\Settings; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php index 9ea44fc..6c9c6de 100644 --- a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php @@ -7,7 +7,7 @@ namespace Drupal\user\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php b/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php index f175653..a33e5ac 100644 --- a/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\user\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php b/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php index ff0b0dc..08ef747 100644 --- a/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\user\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php b/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php index 5485a9b..f96ea6d 100644 --- a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php +++ b/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\user\Access; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php b/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php index cf5e24d..3e9f9c8 100644 --- a/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php +++ b/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\views; -use Drupal\Core\Access\StaticAccessCheckInterface; +use Drupal\Core\Routing\Access\StaticAccessCheckInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php index 097cdd3..9a9b951 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php @@ -7,10 +7,10 @@ namespace Drupal\Tests\Core\Access; -use Drupal\Core\Access\AccessCheckInterface; -use Drupal\Core\Access\AccessInterface; -use Drupal\Core\Access\AccessManager; -use Drupal\Core\Access\DefaultAccessCheck; +use Drupal\Core\Routing\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessInterface; +use Drupal\Core\Routing\Access\AccessManager; +use Drupal\Core\Routing\Access\DefaultAccessCheck; use Drupal\system\Tests\Routing\MockRouteProvider; use Drupal\Tests\UnitTestCase; use Drupal\router_test\Access\DefinedTestAccessCheck; @@ -24,7 +24,7 @@ /** * Tests the access manager. * - * @see \Drupal\Core\Access\AccessManager + * @see \Drupal\Core\Routing\Access\AccessManager */ class AccessManagerTest extends UnitTestCase { @@ -45,7 +45,7 @@ class AccessManagerTest extends UnitTestCase { /** * The access manager to test. * - * @var \Drupal\Core\Access\AccessManager + * @var \Drupal\Core\Routing\Access\AccessManager */ protected $accessManager; @@ -120,7 +120,7 @@ protected function setUp() { } /** - * Tests \Drupal\Core\Access\AccessManager::setChecks(). + * Tests \Drupal\Core\Routing\Access\AccessManager::setChecks(). */ public function testSetChecks() { // Check setChecks without any access checker defined yet. @@ -140,7 +140,7 @@ public function testSetChecks() { } /** - * Tests \Drupal\Core\Access\AccessManager::check(). + * Tests \Drupal\Core\Routing\Access\AccessManager::check(). */ public function testCheck() { $request = new Request(); @@ -264,7 +264,7 @@ public function providerTestCheckConjunctions() { } /** - * Test \Drupal\Core\Access\AccessManager::check() with conjunctions. + * Test \Drupal\Core\Routing\Access\AccessManager::check() with conjunctions. * * @dataProvider providerTestCheckConjunctions */ @@ -294,7 +294,7 @@ public function testCheckConjunctions($conjunction, $name, $condition_one, $cond * Tests the static access checker interface. */ public function testStaticAccessCheckInterface() { - $mock_static = $this->getMock('Drupal\Core\Access\StaticAccessCheckInterface'); + $mock_static = $this->getMock('Drupal\Core\Routing\Access\StaticAccessCheckInterface'); $mock_static->expects($this->once()) ->method('appliesTo') ->will($this->returnValue(array('_access'))); @@ -308,7 +308,7 @@ public function testStaticAccessCheckInterface() { /** * Tests the checkNamedRoute method. * - * @see \Drupal\Core\Access\AccessManager::checkNamedRoute() + * @see \Drupal\Core\Routing\Access\AccessManager::checkNamedRoute() */ public function testCheckNamedRoute() { $this->setupAccessChecker(); @@ -345,7 +345,7 @@ public function testCheckNamedRoute() { /** * Tests the checkNamedRoute with upcasted values. * - * @see \Drupal\Core\Access\AccessManager::checkNamedRoute() + * @see \Drupal\Core\Routing\Access\AccessManager::checkNamedRoute() */ public function testCheckNamedRouteWithUpcastedValues() { $account = $this->getMock('Drupal\Core\Session\AccountInterface'); @@ -385,7 +385,7 @@ public function testCheckNamedRouteWithUpcastedValues() { $this->accessManager->setContainer($this->container); $this->accessManager->setRequest(new Request(array(), array(), array('_account' => $account))); - $access_check = $this->getMock('Drupal\Core\Access\AccessCheckInterface'); + $access_check = $this->getMock('Drupal\Core\Routing\Access\AccessCheckInterface'); $access_check->expects($this->any()) ->method('applies') ->will($this->returnValue(TRUE)); diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php index aa058bb..71fc5ed 100644 --- a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php @@ -8,7 +8,7 @@ namespace Drupal\Tests\Core\Access { use Drupal\Tests\UnitTestCase; -use Drupal\Core\Access\CsrfTokenGenerator; +use Drupal\Core\Routing\Access\CsrfTokenGenerator; use Drupal\Component\Utility\Crypt; use Symfony\Component\HttpFoundation\Request; @@ -20,7 +20,7 @@ class CsrfTokenGeneratorTest extends UnitTestCase { /** * The CSRF token generator. * - * @var \Drupal\Core\Access\CsrfTokenGenerator + * @var \Drupal\Core\Routing\Access\CsrfTokenGenerator */ protected $generator; diff --git a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php index ab02aec..936a614 100644 --- a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\Access; -use Drupal\Core\Access\DefaultAccessCheck; +use Drupal\Core\Routing\Access\DefaultAccessCheck; use Drupal\Tests\UnitTestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; @@ -15,14 +15,14 @@ /** * Defines a test to check the default access checker. * - * @see \Drupal\Core\Access\DefaultAccessCheck + * @see \Drupal\Core\Routing\Access\DefaultAccessCheck */ class DefaultAccessCheckTest extends UnitTestCase { /** * The access checker to test. * - * @var \Drupal\Core\Access\DefaultAccessCheck + * @var \Drupal\Core\Routing\Access\DefaultAccessCheck */ protected $accessChecker; diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php index ad091b8..41cc265 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\Entity; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Drupal\Core\Entity\EntityCreateAccessCheck; use Drupal\Tests\UnitTestCase; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php index f10bb38..247ec6e 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php @@ -72,7 +72,7 @@ class LocalTaskManagerTest extends UnitTestCase { /** * The mocked access manager. * - * @var \Drupal\Core\Access\AccessManager|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Core\Routing\Access\AccessManager|\PHPUnit_Framework_MockObject_MockObject */ protected $accessManager; @@ -96,7 +96,7 @@ protected function setUp() { $this->pluginDiscovery = $this->getMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface'); $this->factory = $this->getMock('Drupal\Component\Plugin\Factory\FactoryInterface'); $this->cacheBackend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface'); - $this->accessManager = $this->getMockBuilder('Drupal\Core\Access\AccessManager') + $this->accessManager = $this->getMockBuilder('Drupal\Core\Routing\Access\AccessManager') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php index a745cc4..94958d0 100644 --- a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\Route; -use Drupal\Core\Access\AccessCheckInterface; +use Drupal\Core\Routing\Access\AccessCheckInterface; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Session\UserSession; use Drupal\Tests\UnitTestCase; diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php old mode 100644 new mode 100755