diff --git a/core/authorize.php b/core/authorize.php index 8a76fe4..3507f7f 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -23,7 +23,7 @@ // Change the directory to the Drupal root. chdir('..'); -require_once __DIR__ . '/vendor/autoload.php'; +require_once __DIR__ . '/autoload.php'; /** * Global flag to identify update.php and authorize.php runs. diff --git a/core/autoload.php b/core/autoload.php new file mode 100644 index 0000000..4909004 --- /dev/null +++ b/core/autoload.php @@ -0,0 +1,7 @@ +add('Drupal\\' . $name, DRUPAL_ROOT . '/' . $path . '/lib'); + $loader->addPsr4('Drupal\\' . $name . '\\', DRUPAL_ROOT . '/' . $path . '/lib/Drupal/' . $name); + $loader->addPsr4('Drupal\\' . $name . '\\', DRUPAL_ROOT . '/' . $path . '/lib'); + $loader->addPsr4('Drupal\\' . $name . '\\', DRUPAL_ROOT . '/' . $path . '/src'); } /** diff --git a/core/install.php b/core/install.php index 7152fd8..e2900a2 100644 --- a/core/install.php +++ b/core/install.php @@ -8,7 +8,7 @@ // Change the directory to the Drupal root. chdir('..'); -require_once __DIR__ . '/vendor/autoload.php'; +require_once __DIR__ . '/autoload.php'; /** * Global flag to indicate the site is in installation mode. diff --git a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/AbstractAnnotatedClassDiscovery.php similarity index 72% copy from core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php copy to core/lib/Drupal/Component/Plugin/Discovery/AbstractAnnotatedClassDiscovery.php index 13f853d..00ceeb7 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/AbstractAnnotatedClassDiscovery.php @@ -17,21 +17,7 @@ /** * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces. */ -class AnnotatedClassDiscovery implements DiscoveryInterface { - - /** - * The namespaces within which to find plugin classes. - * - * @var array - */ - protected $pluginNamespaces; - - /** - * The namespaces of classes that can be used as annotations. - * - * @var array - */ - protected $annotationNamespaces; +abstract class AbstractAnnotatedClassDiscovery implements DiscoveryInterface { /** * The name of the annotation that contains the plugin definition. @@ -44,21 +30,13 @@ class AnnotatedClassDiscovery implements DiscoveryInterface { protected $pluginDefinitionAnnotationName; /** - * Constructs an AnnotatedClassDiscovery object. + * Constructs an AbstractAnnotatedClassDiscovery object. * - * @param array $plugin_namespaces - * (optional) An array of namespace that may contain plugin implementations. - * Defaults to an empty array. - * @param array $annotation_namespaces - * (optional) The namespaces of classes that can be used as annotations. - * Defaults to an empty array. * @param string $plugin_definition_annotation_name * (optional) The name of the annotation that contains the plugin definition. * Defaults to 'Drupal\Component\Annotation\Plugin'. */ - function __construct($plugin_namespaces = array(), $annotation_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { - $this->pluginNamespaces = $plugin_namespaces; - $this->annotationNamespaces = $annotation_namespaces; + function __construct($plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name; } @@ -71,6 +49,36 @@ public function getDefinition($plugin_id) { } /** + * @param $class + * @return bool + */ + public function loadAnnotationClass($class) { + + if (class_exists($class, FALSE)) { + return TRUE; + } + + foreach ($this->getAnnotationNamespaces() as $namespace => $dirs) { + if (0 === strpos($class, $namespace)) { + if (TRUE === $dirs) { + // Use the regular class loader. + return class_exists($class); + } + // Treat $dirs as PSR-4 directories. + $relativePath = str_replace('\\', '/', substr($class, strlen($namespace))) . '.php'; + foreach ((array) $dirs as $dir) { + if (file_exists($file = $dir . '/' . $relativePath)) { + require $file; + return TRUE; + } + } + } + } + + return FALSE; + } + + /** * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions(). */ public function getDefinitions() { @@ -81,13 +89,15 @@ public function getDefinitions() { $reader->addGlobalIgnoredName('file'); // Register the namespaces of classes that can be used for annotations. - AnnotationRegistry::registerAutoloadNamespaces($this->getAnnotationNamespaces()); + AnnotationRegistry::registerLoader(array($this, 'loadAnnotationClass')); // Search for classes within all PSR-0 namespace locations. foreach ($this->getPluginNamespaces() as $namespace => $dirs) { foreach ($dirs as $dir) { - $dir .= DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $namespace); if (file_exists($dir)) { + /** + * @var DirectoryIterator $fileinfo + */ foreach (new DirectoryIterator($dir) as $fileinfo) { // @todo Once core requires 5.3.6, use $fileinfo->getExtension(). if (pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION) == 'php') { @@ -111,21 +121,21 @@ public function getDefinitions() { } } } + + // Don't let the loaders pile up. + AnnotationRegistry::reset(); + return $definitions; } /** * Returns an array of PSR-0 namespaces to search for plugin classes. */ - protected function getPluginNamespaces() { - return $this->pluginNamespaces; - } + protected abstract function getPluginNamespaces(); /** * Returns an array of PSR-0 namespaces to search for annotation classes. */ - protected function getAnnotationNamespaces() { - return $this->annotationNamespaces; - } + protected abstract function getAnnotationNamespaces(); } diff --git a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php index 13f853d..cf33fb8 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php @@ -7,17 +7,13 @@ namespace Drupal\Component\Plugin\Discovery; -use DirectoryIterator; -use Drupal\Component\Plugin\Discovery\DiscoveryInterface; -use Drupal\Component\Reflection\MockFileFinder; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Annotations\AnnotationRegistry; -use Doctrine\Common\Reflection\StaticReflectionParser; /** * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces. */ -class AnnotatedClassDiscovery implements DiscoveryInterface { +class AnnotatedClassDiscovery extends AbstractAnnotatedClassDiscovery { /** * The namespaces within which to find plugin classes. @@ -34,16 +30,6 @@ class AnnotatedClassDiscovery implements DiscoveryInterface { protected $annotationNamespaces; /** - * The name of the annotation that contains the plugin definition. - * - * The class corresponding to this name must implement - * \Drupal\Component\Annotation\AnnotationInterface. - * - * @var string - */ - protected $pluginDefinitionAnnotationName; - - /** * Constructs an AnnotatedClassDiscovery object. * * @param array $plugin_namespaces @@ -59,70 +45,18 @@ class AnnotatedClassDiscovery implements DiscoveryInterface { function __construct($plugin_namespaces = array(), $annotation_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { $this->pluginNamespaces = $plugin_namespaces; $this->annotationNamespaces = $annotation_namespaces; - $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name; - } - - /** - * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinition(). - */ - public function getDefinition($plugin_id) { - $plugins = $this->getDefinitions(); - return isset($plugins[$plugin_id]) ? $plugins[$plugin_id] : NULL; - } - - /** - * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions(). - */ - public function getDefinitions() { - $definitions = array(); - $reader = new AnnotationReader(); - // Prevent @endlink from being parsed as an annotation. - $reader->addGlobalIgnoredName('endlink'); - $reader->addGlobalIgnoredName('file'); - - // Register the namespaces of classes that can be used for annotations. - AnnotationRegistry::registerAutoloadNamespaces($this->getAnnotationNamespaces()); - - // Search for classes within all PSR-0 namespace locations. - foreach ($this->getPluginNamespaces() as $namespace => $dirs) { - foreach ($dirs as $dir) { - $dir .= DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $namespace); - if (file_exists($dir)) { - foreach (new DirectoryIterator($dir) as $fileinfo) { - // @todo Once core requires 5.3.6, use $fileinfo->getExtension(). - if (pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION) == 'php') { - $class = $namespace . '\\' . $fileinfo->getBasename('.php'); - - // The filename is already known, so there is no need to find the - // file. However, StaticReflectionParser needs a finder, so use a - // mock version. - $finder = MockFileFinder::create($fileinfo->getPathName()); - $parser = new StaticReflectionParser($class, $finder); - - if ($annotation = $reader->getClassAnnotation($parser->getReflectionClass(), $this->pluginDefinitionAnnotationName)) { - // AnnotationInterface::get() returns the array definition - // instead of requiring us to work with the annotation object. - $definition = $annotation->get(); - $definition['class'] = $class; - $definitions[$definition['id']] = $definition; - } - } - } - } - } - } - return $definitions; + parent::__construct($plugin_definition_annotation_name); } /** - * Returns an array of PSR-0 namespaces to search for plugin classes. + * @inheritdoc */ protected function getPluginNamespaces() { return $this->pluginNamespaces; } /** - * Returns an array of PSR-0 namespaces to search for annotation classes. + * @inheritdoc */ protected function getAnnotationNamespaces() { return $this->annotationNamespaces; diff --git a/core/lib/Drupal/Core/Action/ActionManager.php b/core/lib/Drupal/Core/Action/ActionManager.php index a3bfeda..8013724 100644 --- a/core/lib/Drupal/Core/Action/ActionManager.php +++ b/core/lib/Drupal/Core/Action/ActionManager.php @@ -28,7 +28,7 @@ class ActionManager extends PluginManagerBase { * keyed by the corresponding namespace to look for plugin implementations. */ public function __construct(\Traversable $namespaces) { - $this->discovery = new AnnotatedClassDiscovery('Plugin/Action', $namespaces, array(), 'Drupal\Core\Annotation\Action'); + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\Action', 'Drupal\Core\Annotation\Action'); $this->discovery = new AlterDecorator($this->discovery, 'action_info'); $this->factory = new ContainerFactory($this); diff --git a/core/lib/Drupal/Core/Archiver/ArchiverManager.php b/core/lib/Drupal/Core/Archiver/ArchiverManager.php index 14c2a9c..78d431f 100644 --- a/core/lib/Drupal/Core/Archiver/ArchiverManager.php +++ b/core/lib/Drupal/Core/Archiver/ArchiverManager.php @@ -31,7 +31,7 @@ class ArchiverManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - parent::__construct('Plugin/Archiver', $namespaces); + parent::__construct($namespaces, 'Plugin\Archiver'); $this->alterInfo($module_handler, 'archiver_info'); $this->setCacheBackend($cache_backend, $language_manager, 'archiver_info'); } diff --git a/core/lib/Drupal/Core/Autoload/ClassLoader.php b/core/lib/Drupal/Core/Autoload/ClassLoader.php new file mode 100644 index 0000000..1e1e1f5 --- /dev/null +++ b/core/lib/Drupal/Core/Autoload/ClassLoader.php @@ -0,0 +1,372 @@ +add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + */ +class ClassLoader { + + // PSR-4 + private $prefixLengthsPsr4 = array(); + private $prefixDirsPsr4 = array(); + private $fallbackDirsPsr4 = array(); + + // PSR-0 + private $prefixesPsr0 = array(); + private $fallbackDirsPsr0 = array(); + + private $useIncludePath = false; + private $classMap = array(); + + const PREDICTOR_INDEX = 9; + + public function getPrefixes() { + return call_user_func_array('array_merge', $this->prefixesPsr0); + } + + public function getPrefixesPsr4() { + return $this->prefixDirsPsr4; + } + + public function getFallbackDirs() { + return $this->fallbackDirsPsr0; + } + + public function getFallbackDirsPsr4() { + return $this->fallbackDirsPsr4; + } + + public function getClassMap() { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + */ + public function addClassMap(array $classMap) { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } + else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + */ + public function add($prefix, $paths, $prepend = false) { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + (array) $paths, + $this->fallbackDirsPsr0 + ); + } + else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + (array) $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = (array) $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + (array) $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } + else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-0 base directories + * @param bool $prepend Whether to prepend the directories + * @throws \Exception + */ + public function addPsr4($prefix, $paths, $prepend = false) { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + (array) $paths, + $this->fallbackDirsPsr4 + ); + } + else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + (array) $paths + ); + } + } + elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \Exception("A non-empty PSR-4 prefix must end with a namespace separator."); + } + if ($length > self::PREDICTOR_INDEX) { + $predictor = $prefix[0] . $prefix[self::PREDICTOR_INDEX]; + $this->prefixLengthsPsr4[$predictor][$prefix] = $length; + } + else { + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + } + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + (array) $paths, + $this->prefixDirsPsr4[$prefix] + ); + } + else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories + */ + public function set($prefix, $paths) { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } + else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * @throws \Exception + */ + public function setPsr4($prefix, $paths) { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } + else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \Exception("A non-empty PSR-4 prefix must end with a namespace separator."); + } + if ($length > self::PREDICTOR_INDEX) { + $predictor = $prefix[0] . $prefix[self::PREDICTOR_INDEX]; + $this->prefixLengthsPsr4[$predictor][$prefix] = $length; + } + else { + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + } + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() { + return $this->useIncludePath; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + */ + public function register($prepend = false) { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) { + if ($file = $this->findFile($class)) { + include $file; + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) { + // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php'; + + $first = $class[0]; + if (isset($class[self::PREDICTOR_INDEX])) { + $predictor = $first . $class[self::PREDICTOR_INDEX]; + if (isset($this->prefixLengthsPsr4[$predictor])) { + foreach ($this->prefixLengthsPsr4[$predictor] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + return $file; + } + } + } + } + } + } + + if (isset($this->prefixLengthsPsr4[$first])) { + foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 + = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR) + ; + } + else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php'; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + + // Remember that this class does not exist. + return $this->classMap[$class] = false; + } +} \ No newline at end of file diff --git a/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php b/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php new file mode 100644 index 0000000..204ec52 --- /dev/null +++ b/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php @@ -0,0 +1,57 @@ +setPsr4('Drupal\Core\\', $baseDir . '/core/lib/Drupal/Core'); + $loader->setPsr4('Drupal\Component\\', $baseDir . '/core/lib/Drupal/Component'); + $loader->setPsr4('Drupal\Driver\\', $baseDir . '/core/lib/Drupal/Driver'); + foreach ($map as $namespace => $path) { + $loader->set($namespace, $path); + } + + $classMap = require $composerDir . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + + $loader->register(true); + + // @todo This can be updated once Composer provides a autoload_files.php. + require $vendorDir . '/kriswallsmith/assetic/src/functions.php'; + require $baseDir . '/core/lib/Drupal.php'; + + return $loader; + } +} diff --git a/core/lib/Drupal/Core/Condition/ConditionManager.php b/core/lib/Drupal/Core/Condition/ConditionManager.php index 7f5d630..090ee9a 100644 --- a/core/lib/Drupal/Core/Condition/ConditionManager.php +++ b/core/lib/Drupal/Core/Condition/ConditionManager.php @@ -36,10 +36,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac $this->alterInfo($module_handler, 'condition_info'); $this->setCacheBackend($cache_backend, $language_manager, 'condition'); - $annotation_namespaces = array( - 'Drupal\Core\Condition\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - parent::__construct('Plugin/Condition', $namespaces, $annotation_namespaces, 'Drupal\Core\Condition\Annotation\Condition'); + parent::__construct($namespaces, 'Plugin\Condition', 'Drupal\Core\Condition\Annotation\Condition'); + $this->addAnnotationNamespace('Drupal\Core\Condition\Annotation'); } /** diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 1bf9c05..35c18ae 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\TerminableInterface; -use Composer\Autoload\ClassLoader; +use Drupal\Core\Autoload\ClassLoader; /** * The DrupalKernel class is the core of Drupal itself. @@ -97,7 +97,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface { /** * The classloader object. * - * @var \Composer\Autoload\ClassLoader + * @var \Drupal\Core\Autoload\ClassLoader */ protected $classLoader; @@ -150,7 +150,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface { * String indicating the environment, e.g. 'prod' or 'dev'. Used by * Symfony\Component\HttpKernel\Kernel::__construct(). Drupal does not use * this value currently. Pass 'prod'. - * @param \Composer\Autoload\ClassLoader $class_loader + * @param \Drupal\Core\Autoload\ClassLoader $class_loader * (optional) The classloader is only used if $storage is not given or * the load from storage fails and a container rebuild is required. In * this case, the loaded modules will be registered with this loader in @@ -218,7 +218,7 @@ public function discoverServiceProviders() { $this->moduleList = isset($module_list['enabled']) ? $module_list['enabled'] : array(); } $module_filenames = $this->getModuleFileNames(); - $this->registerNamespaces($this->getModuleNamespaces($module_filenames)); + $this->registerNamespacesPsr4($this->getModuleNamespacesPsr4($module_filenames)); // Load each module's serviceProvider class. foreach ($this->moduleList as $module => $weight) { @@ -402,8 +402,8 @@ protected function initializeContainer() { // All namespaces must be registered before we attempt to use any service // from the container. $container_modules = $this->container->getParameter('container.modules'); - $namespaces_before = $this->classLoader->getPrefixes(); - $this->registerNamespaces($this->getModuleNamespaces($container_modules)); + $namespaces_before = $this->classLoader->getPrefixesPsr4(); + $this->registerNamespacesPsr4($this->getModuleNamespacesPsr4($container_modules)); // If 'container.modules' is wrong, the container must be rebuilt. if (!isset($this->moduleList)) { @@ -416,9 +416,9 @@ protected function initializeContainer() { // registerNamespaces() performs a merge rather than replace, so to // effectively remove erroneous registrations, we must replace them with // empty arrays. - $namespaces_after = $this->classLoader->getPrefixes(); + $namespaces_after = $this->classLoader->getPrefixesPsr4(); $namespaces_before += array_fill_keys(array_diff(array_keys($namespaces_after), array_keys($namespaces_before)), array()); - $this->registerNamespaces($namespaces_before); + $this->registerNamespacesPsr4($namespaces_before); } } @@ -492,14 +492,18 @@ protected function buildContainer() { $container->setParameter('container.modules', $this->getModuleFileNames()); // Get a list of namespaces and put it onto the container. - $namespaces = $this->getModuleNamespaces($this->getModuleFileNames()); + $namespaces = $this->getModuleNamespacesPsr4($this->getModuleFileNames()); // Add all components in \Drupal\Core and \Drupal\Component that have a // Plugin directory. foreach (array('Core', 'Component') as $parent_directory) { $path = DRUPAL_ROOT . '/core/lib/Drupal/' . $parent_directory; + $parent_namespace = 'Drupal\\' . $parent_directory; + /** + * @var \DirectoryIterator $component + */ foreach (new \DirectoryIterator($path) as $component) { if (!$component->isDot() && is_dir($component->getPathname() . '/Plugin')) { - $namespaces['Drupal\\' . $parent_directory .'\\' . $component->getFilename()] = DRUPAL_ROOT . '/core/lib'; + $namespaces[$parent_namespace . '\\' . $component->getFilename()] = $path . '/' . $component->getFilename(); } } } @@ -632,7 +636,30 @@ protected function getModuleFileNames() { } /** - * Gets the namespaces of each enabled module. + * Gets the namespaces of each enabled module, + * each with their PSR-4 directories. + * + * @param array $moduleFileNames + * @return array + */ + protected function getModuleNamespacesPsr4($moduleFileNames) { + $namespaces = array(); + foreach ($moduleFileNames as $module => $filename) { + $namespaces["Drupal\\$module"][] = DRUPAL_ROOT . '/' . dirname($filename) . '/lib/Drupal/' . $module; + // For the time being, register lib and src likewise, + // until this is decided in https://drupal.org/node/1971198 + $namespaces["Drupal\\$module"][] = DRUPAL_ROOT . '/' . dirname($filename) . '/lib'; + $namespaces["Drupal\\$module"][] = DRUPAL_ROOT . '/' . dirname($filename) . '/src'; + } + return $namespaces; + } + + /** + * Gets the namespaces of each enabled module, + * each with its PSR-0 directory. + * + * @param array $moduleFileNames + * @return array */ protected function getModuleNamespaces($moduleFileNames) { $namespaces = array(); @@ -643,7 +670,20 @@ protected function getModuleNamespaces($moduleFileNames) { } /** - * Registers a list of namespaces. + * Registers a list of namespaces with PSR-4 directories. + * + * @param array $namespaces + */ + protected function registerNamespacesPsr4(array $namespaces = array()) { + foreach ($namespaces as $prefix => $paths) { + $this->classLoader->addPsr4($prefix . '\\', $paths); + } + } + + /** + * Registers a list of namespaces with PSR-0 directories. + * + * @param array $namespaces */ protected function registerNamespaces(array $namespaces = array()) { foreach ($namespaces as $prefix => $path) { diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index 3060909..5939ab4 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -136,11 +136,11 @@ public function __construct(\Traversable $namespaces, ContainerInterface $contai } protected function doDiscovery($namespaces) { - $annotation_namespaces = array( - 'Drupal\Core\Entity\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - $this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\EntityType'); + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Entity', 'Drupal\Core\Entity\Annotation\EntityType'); + $this->discovery->addAnnotationNamespace('Drupal\Core\Entity\Annotation'); $this->discovery = new InfoHookDecorator($this->discovery, 'entity_info'); + + // Allow the plugin definition to be altered by hook_entity_info_alter(). $this->discovery = new AlterDecorator($this->discovery, 'entity_info'); $this->discovery = new CacheDecorator($this->discovery, 'entity_info:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); } @@ -192,6 +192,7 @@ public function hasController($entity_type, $controller_type) { * (optional) If this controller definition is nested, the name of the key. * Defaults to NULL. * + * @throws \InvalidArgumentException * @return string * The class name for this controller instance. */ diff --git a/core/lib/Drupal/Core/Entity/Field/FieldTypePluginManager.php b/core/lib/Drupal/Core/Entity/Field/FieldTypePluginManager.php index 0be215e..6a60cc0 100644 --- a/core/lib/Drupal/Core/Entity/Field/FieldTypePluginManager.php +++ b/core/lib/Drupal/Core/Entity/Field/FieldTypePluginManager.php @@ -42,10 +42,8 @@ class FieldTypePluginManager extends DefaultPluginManager { * The module handler. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array( - 'Drupal\Core\Entity\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - parent::__construct('Plugin/field/field_type', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\FieldType'); + parent::__construct($namespaces, 'Plugin\field\field_type', 'Drupal\Core\Entity\Annotation\FieldType'); + $this->addAnnotationNamespace('Drupal\Core\Entity\Annotation'); $this->alterInfo($module_handler, 'field_info'); $this->setCacheBackend($cache_backend, $language_manager, 'field_types'); diff --git a/core/lib/Drupal/Core/Menu/LocalActionManager.php b/core/lib/Drupal/Core/Menu/LocalActionManager.php index c99dd83..adf41db 100644 --- a/core/lib/Drupal/Core/Menu/LocalActionManager.php +++ b/core/lib/Drupal/Core/Menu/LocalActionManager.php @@ -65,7 +65,7 @@ class LocalActionManager extends DefaultPluginManager { * The language manager. */ public function __construct(\Traversable $namespaces, ControllerResolverInterface $controller_resolver, Request $request, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache_backend, LanguageManager $language_manager) { - parent::__construct('Plugin/Menu/LocalAction', $namespaces, array(), 'Drupal\Core\Annotation\Menu\LocalAction'); + parent::__construct($namespaces, 'Plugin\Menu\LocalAction', 'Drupal\Core\Annotation\Menu\LocalAction'); $this->controllerResolver = $controller_resolver; $this->request = $request; diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php index 17b5128..9b1bb16 100644 --- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php +++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php @@ -73,7 +73,7 @@ class LocalTaskManager extends DefaultPluginManager { * The language manager. */ public function __construct(\Traversable $namespaces, ControllerResolverInterface $controller_resolver, Request $request, RouteProviderInterface $route_provider, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManager $language_manager) { - parent::__construct('Plugin/Menu/LocalTask', $namespaces, array(), 'Drupal\Core\Annotation\Menu\LocalTask'); + parent::__construct($namespaces, 'Plugin\Menu\LocalTask', 'Drupal\Core\Annotation\Menu\LocalTask'); $this->controllerResolver = $controller_resolver; $this->request = $request; $this->routeProvider = $route_provider; diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php index f802b0c..a724dab 100644 --- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php +++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php @@ -25,6 +25,11 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInterface, CachedDiscoveryInterface { /** + * @var \Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery + */ + protected $originalDiscovery; + + /** * Cached definitions array. * * @var array @@ -91,26 +96,47 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt /** * Creates the discovery object. * - * @param string|bool $subdir - * The plugin's subdirectory, for example Plugin/views/filter. * @param \Traversable $namespaces * An object that implements \Traversable which contains the root paths * keyed by the corresponding namespace to look for plugin implementations. - * @param array $annotation_namespaces - * (optional) The namespaces of classes that can be used as annotations. - * Defaults to an empty array. + * @param string|bool $namespace_suffix + * The suffix to append to each of the root namespaces, to obtain the plugin + * namespaces. * @param string $plugin_definition_annotation_name * (optional) The name of the annotation that contains the plugin definition. * Defaults to 'Drupal\Component\Annotation\Plugin'. + * @throws \Exception + * Throws an exception, if the parameters are wrong. */ - public function __construct($subdir, \Traversable $namespaces, $annotation_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { - $this->subdir = $subdir; - $this->discovery = new AnnotatedClassDiscovery($subdir, $namespaces, $annotation_namespaces, $plugin_definition_annotation_name); - $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery); + public function __construct(\Traversable $namespaces, $namespace_suffix, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { + if (!is_string($namespace_suffix)) { + throw new \Exception("Second argument must be a string."); + } + if (FALSE !== strpos($namespace_suffix, '/')) { + throw new \Exception("Second argument is a namespace suffix, and must not contain a directory separator."); + } + if (!is_string($plugin_definition_annotation_name)) { + throw new \Exception("Third argument must be a string."); + } + if (FALSE !== strpos($plugin_definition_annotation_name, '/')) { + throw new \Exception("Third argument is a class, and must not contain a directory separator."); + } + $this->originalDiscovery = new AnnotatedClassDiscovery($namespaces, $namespace_suffix, $plugin_definition_annotation_name); + $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->originalDiscovery); $this->factory = new ContainerFactory($this); } /** + * @param string $namespace + * @param bool|string|array $dir + * The PSR-4 directory, or an array of PSR-4 directories, or + * TRUE, to use the regular class loader via class_exists(). + */ + protected function addAnnotationNamespace($namespace, $dir = TRUE) { + $this->originalDiscovery->addAnnotationNamespace($namespace, $dir); + } + + /** * Initialize the cache backend. * * Plugin definitions are cached using the provided cache backend. The diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php index 63c87ab..c283226 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php +++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php @@ -7,12 +7,19 @@ namespace Drupal\Core\Plugin\Discovery; -use Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery as ComponentAnnotatedClassDiscovery; +use Drupal\Component\Plugin\Discovery\AbstractAnnotatedClassDiscovery; /** * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces. */ -class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery { +class AnnotatedClassDiscovery extends AbstractAnnotatedClassDiscovery { + + /** + * An object containing the namespaces to look for plugin implementations. + * + * @var \Traversable + */ + protected $rootNamespacesIterator; /** * The subdirectory within a namespace to look for plugins. @@ -22,43 +29,63 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery { * * @var string */ - protected $subdir = ''; + protected $directorySuffix = ''; /** - * An object containing the namespaces to look for plugin implementations. + * The subdirectory within a namespace to look for plugins. * - * @var \Traversable + * If the plugins are in the top level of the namespace and not within a + * subdirectory, set this to an empty string. + * + * @var string */ - protected $rootNamespacesIterator; + protected $namespaceSuffix = ''; + + /** + * The namespaces of classes that can be used as annotations. + * + * @var array + */ + protected $annotationNamespaces = array(); /** * Constructs an AnnotatedClassDiscovery object. * - * @param string $subdir - * Either the plugin's subdirectory, for example 'Plugin/views/filter', or - * empty string if plugins are located at the top level of the namespace. * @param \Traversable $root_namespaces * An object that implements \Traversable which contains the root paths * keyed by the corresponding namespace to look for plugin implementations. * If $subdir is not an empty string, it will be appended to each namespace. - * @param array $annotation_namespaces - * (optional) The namespaces of classes that can be used as annotations. - * Defaults to an empty array. + * @param string $namespace_suffix + * Suffix to append to each of the root namespaces, to obtain the plugin + * namespaces. E.g. '\Plugin\views\filter', or empty string if plugins are + * located at the top level of each of the root namespaces. * @param string $plugin_definition_annotation_name * (optional) The name of the annotation that contains the plugin definition. * Defaults to 'Drupal\Component\Annotation\Plugin'. */ - function __construct($subdir, \Traversable $root_namespaces, $annotation_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { - if ($subdir) { - $this->subdir = str_replace('/', '\\', $subdir); - } + public function __construct(\Traversable $root_namespaces, $namespace_suffix = '', $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { $this->rootNamespacesIterator = $root_namespaces; - $annotation_namespaces += array( - 'Drupal\Component\Annotation' => DRUPAL_ROOT . '/core/lib', - 'Drupal\Core\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - $plugin_namespaces = array(); - parent::__construct($plugin_namespaces, $annotation_namespaces, $plugin_definition_annotation_name); + if ($namespace_suffix) { + if ($namespace_suffix && '\\' !== $namespace_suffix[0]) { + $namespace_suffix = '\\' . $namespace_suffix; + } + $this->namespaceSuffix = $namespace_suffix; + $this->directorySuffix = str_replace('\\', '/', $namespace_suffix); + } + $this->addAnnotationNamespace('Drupal\Component\Annotation'); + $this->addAnnotationNamespace('Drupal\Core\Annotation'); + parent::__construct($plugin_definition_annotation_name); + } + + /** + * @param string $namespace + * The namespace. + * @param bool|string|array $dir + * The PSR-4 directory, or an array of PSR-4 directories, or + * TRUE, to use the regular class loader via class_exists(). + */ + public function addAnnotationNamespace($namespace, $dir = TRUE) { + $this->annotationNamespaces[$namespace] = $dir; } /** @@ -99,14 +126,28 @@ protected function getProviderFromNamespace($namespace) { */ protected function getPluginNamespaces() { $plugin_namespaces = array(); - foreach ($this->rootNamespacesIterator as $namespace => $dir) { - if ($this->subdir) { - $namespace .= "\\{$this->subdir}"; + if ($this->namespaceSuffix) { + foreach ($this->rootNamespacesIterator as $namespace => $dirs) { + $namespace .= $this->namespaceSuffix; + foreach ((array) $dirs as $dir) { + $plugin_namespaces[$namespace][] = $dir . $this->directorySuffix; + } + } + } + else { + foreach ($this->rootNamespacesIterator as $namespace => $dirs) { + $plugin_namespaces[$namespace] = (array) $dirs; } - $plugin_namespaces[$namespace] = array($dir); } return $plugin_namespaces; } + /** + * @inheritdoc + */ + protected function getAnnotationNamespaces() { + return $this->annotationNamespaces; + } + } diff --git a/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/core/lib/Drupal/Core/TypedData/TypedDataManager.php index 6f85867..36769fd 100644 --- a/core/lib/Drupal/Core/TypedData/TypedDataManager.php +++ b/core/lib/Drupal/Core/TypedData/TypedDataManager.php @@ -49,10 +49,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac $this->alterInfo($module_handler, 'data_type_info'); $this->setCacheBackend($cache_backend, $language_manager, 'typed_data:types'); - $annotation_namespaces = array( - 'Drupal\Core\TypedData\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - parent::__construct('Plugin/DataType', $namespaces, $annotation_namespaces, 'Drupal\Core\TypedData\Annotation\DataType'); + parent::__construct($namespaces, 'Plugin\DataType', 'Drupal\Core\TypedData\Annotation\DataType'); + $this->addAnnotationNamespace('Drupal\Core\TypedData\Annotation'); } /** diff --git a/core/lib/Drupal/Core/Validation/ConstraintManager.php b/core/lib/Drupal/Core/Validation/ConstraintManager.php index 91551bc..3fe6ace 100644 --- a/core/lib/Drupal/Core/Validation/ConstraintManager.php +++ b/core/lib/Drupal/Core/Validation/ConstraintManager.php @@ -47,7 +47,7 @@ class ConstraintManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - parent::__construct('Plugin/Validation/Constraint', $namespaces); + parent::__construct($namespaces, 'Plugin\Validation\Constraint'); $this->discovery = new StaticDiscoveryDecorator($this->discovery, array($this, 'registerDefinitions')); $this->alterInfo($module_handler, 'validation_constraint'); $this->setCacheBackend($cache_backend, $language_manager, 'validation_constraint'); diff --git a/core/modules/action/lib/Drupal/action/ActionAccessController.php b/core/modules/action/src/ActionAccessController.php similarity index 100% rename from core/modules/action/lib/Drupal/action/ActionAccessController.php rename to core/modules/action/src/ActionAccessController.php diff --git a/core/modules/action/lib/Drupal/action/ActionAddFormController.php b/core/modules/action/src/ActionAddFormController.php similarity index 100% rename from core/modules/action/lib/Drupal/action/ActionAddFormController.php rename to core/modules/action/src/ActionAddFormController.php diff --git a/core/modules/action/lib/Drupal/action/ActionEditFormController.php b/core/modules/action/src/ActionEditFormController.php similarity index 100% rename from core/modules/action/lib/Drupal/action/ActionEditFormController.php rename to core/modules/action/src/ActionEditFormController.php diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/src/ActionFormControllerBase.php similarity index 100% rename from core/modules/action/lib/Drupal/action/ActionFormControllerBase.php rename to core/modules/action/src/ActionFormControllerBase.php diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action/src/ActionListController.php similarity index 100% rename from core/modules/action/lib/Drupal/action/ActionListController.php rename to core/modules/action/src/ActionListController.php diff --git a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php b/core/modules/action/src/Form/ActionAdminManageForm.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php rename to core/modules/action/src/Form/ActionAdminManageForm.php diff --git a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php b/core/modules/action/src/Form/ActionDeleteForm.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php rename to core/modules/action/src/Form/ActionDeleteForm.php diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/action/src/Plugin/Action/EmailAction.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php rename to core/modules/action/src/Plugin/Action/EmailAction.php diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php b/core/modules/action/src/Plugin/Action/GotoAction.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php rename to core/modules/action/src/Plugin/Action/GotoAction.php diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php b/core/modules/action/src/Plugin/Action/MessageAction.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php rename to core/modules/action/src/Plugin/Action/MessageAction.php diff --git a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php b/core/modules/action/src/Tests/BulkFormTest.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php rename to core/modules/action/src/Tests/BulkFormTest.php diff --git a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php b/core/modules/action/src/Tests/ConfigurationTest.php similarity index 100% rename from core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php rename to core/modules/action/src/Tests/ConfigurationTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php b/core/modules/aggregator/src/Access/CategoriesAccessCheck.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php rename to core/modules/aggregator/src/Access/CategoriesAccessCheck.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorFetcher.php b/core/modules/aggregator/src/Annotation/AggregatorFetcher.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorFetcher.php rename to core/modules/aggregator/src/Annotation/AggregatorFetcher.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorParser.php b/core/modules/aggregator/src/Annotation/AggregatorParser.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorParser.php rename to core/modules/aggregator/src/Annotation/AggregatorParser.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorProcessor.php b/core/modules/aggregator/src/Annotation/AggregatorProcessor.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorProcessor.php rename to core/modules/aggregator/src/Annotation/AggregatorProcessor.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageController.php b/core/modules/aggregator/src/CategoryStorageController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageController.php rename to core/modules/aggregator/src/CategoryStorageController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageControllerInterface.php b/core/modules/aggregator/src/CategoryStorageControllerInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageControllerInterface.php rename to core/modules/aggregator/src/CategoryStorageControllerInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php rename to core/modules/aggregator/src/Controller/AggregatorController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php rename to core/modules/aggregator/src/Entity/Feed.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php rename to core/modules/aggregator/src/Entity/Item.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php b/core/modules/aggregator/src/FeedFormController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php rename to core/modules/aggregator/src/FeedFormController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php b/core/modules/aggregator/src/FeedInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php rename to core/modules/aggregator/src/FeedInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedRenderController.php b/core/modules/aggregator/src/FeedRenderController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/FeedRenderController.php rename to core/modules/aggregator/src/FeedRenderController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php b/core/modules/aggregator/src/FeedStorageController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php rename to core/modules/aggregator/src/FeedStorageController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php b/core/modules/aggregator/src/FeedStorageControllerInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php rename to core/modules/aggregator/src/FeedStorageControllerInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php b/core/modules/aggregator/src/Form/AggregatorCategorizeFormBase.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php rename to core/modules/aggregator/src/Form/AggregatorCategorizeFormBase.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeCategoryForm.php b/core/modules/aggregator/src/Form/CategorizeCategoryForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeCategoryForm.php rename to core/modules/aggregator/src/Form/CategorizeCategoryForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeFeedForm.php b/core/modules/aggregator/src/Form/CategorizeFeedForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeFeedForm.php rename to core/modules/aggregator/src/Form/CategorizeFeedForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php b/core/modules/aggregator/src/Form/CategoryAdminForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php rename to core/modules/aggregator/src/Form/CategoryAdminForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php b/core/modules/aggregator/src/Form/CategoryDeleteForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php rename to core/modules/aggregator/src/Form/CategoryDeleteForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php b/core/modules/aggregator/src/Form/FeedDeleteForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php rename to core/modules/aggregator/src/Form/FeedDeleteForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php b/core/modules/aggregator/src/Form/FeedItemsRemoveForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php rename to core/modules/aggregator/src/Form/FeedItemsRemoveForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/src/Form/OpmlFeedAdd.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php rename to core/modules/aggregator/src/Form/OpmlFeedAdd.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php b/core/modules/aggregator/src/Form/SettingsForm.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php rename to core/modules/aggregator/src/Form/SettingsForm.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php b/core/modules/aggregator/src/ItemInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php rename to core/modules/aggregator/src/ItemInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php b/core/modules/aggregator/src/ItemRenderController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php rename to core/modules/aggregator/src/ItemRenderController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/src/ItemStorageController.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php rename to core/modules/aggregator/src/ItemStorageController.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php b/core/modules/aggregator/src/ItemStorageControllerInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php rename to core/modules/aggregator/src/ItemStorageControllerInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginManager.php b/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php similarity index 84% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginManager.php rename to core/modules/aggregator/src/Plugin/AggregatorPluginManager.php index 6362b51..96bcddf 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginManager.php +++ b/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php @@ -36,11 +36,8 @@ public function __construct($type, \Traversable $namespaces, CacheBackendInterfa 'processor' => 'Drupal\aggregator\Annotation\AggregatorProcessor', ); - $annotation_namespaces = array( - 'Drupal\aggregator\Annotation' => DRUPAL_ROOT . '/core/modules/aggregator/lib', - ); - - parent::__construct("Plugin/aggregator/$type", $namespaces, $annotation_namespaces, $type_annotations[$type]); + parent::__construct($namespaces, "Plugin\\aggregator\\$type", $type_annotations[$type]); + $this->addAnnotationNamespace('Drupal\aggregator\Annotation'); $this->setCacheBackend($cache_backend, $language_manager, "aggregator_$type"); } diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginSettingsBase.php b/core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginSettingsBase.php rename to core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorCategoryBlock.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php rename to core/modules/aggregator/src/Plugin/Block/AggregatorCategoryBlock.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php rename to core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php b/core/modules/aggregator/src/Plugin/Derivative/AggregatorCategoryBlock.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php rename to core/modules/aggregator/src/Plugin/Derivative/AggregatorCategoryBlock.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Derivative/AggregatorFeedBlock.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorFeedBlock.php rename to core/modules/aggregator/src/Plugin/Derivative/AggregatorFeedBlock.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php b/core/modules/aggregator/src/Plugin/FetcherInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php rename to core/modules/aggregator/src/Plugin/FetcherInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php b/core/modules/aggregator/src/Plugin/ParserInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php rename to core/modules/aggregator/src/Plugin/ParserInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php b/core/modules/aggregator/src/Plugin/ProcessorInterface.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php rename to core/modules/aggregator/src/Plugin/ProcessorInterface.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php rename to core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php b/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php rename to core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php rename to core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php b/core/modules/aggregator/src/Plugin/views/argument/CategoryCid.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php rename to core/modules/aggregator/src/Plugin/views/argument/CategoryCid.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/core/modules/aggregator/src/Plugin/views/argument/Fid.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php rename to core/modules/aggregator/src/Plugin/views/argument/Fid.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/core/modules/aggregator/src/Plugin/views/argument/Iid.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php rename to core/modules/aggregator/src/Plugin/views/argument/Iid.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php b/core/modules/aggregator/src/Plugin/views/field/Category.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php rename to core/modules/aggregator/src/Plugin/views/field/Category.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/core/modules/aggregator/src/Plugin/views/field/TitleLink.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php rename to core/modules/aggregator/src/Plugin/views/field/TitleLink.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php b/core/modules/aggregator/src/Plugin/views/field/Xss.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php rename to core/modules/aggregator/src/Plugin/views/field/Xss.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php b/core/modules/aggregator/src/Plugin/views/filter/CategoryCid.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php rename to core/modules/aggregator/src/Plugin/views/filter/CategoryCid.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php b/core/modules/aggregator/src/Plugin/views/row/Rss.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php rename to core/modules/aggregator/src/Plugin/views/row/Rss.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php rename to core/modules/aggregator/src/Tests/AddFeedTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php b/core/modules/aggregator/src/Tests/AggregatorConfigurationTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php rename to core/modules/aggregator/src/Tests/AggregatorConfigurationTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php b/core/modules/aggregator/src/Tests/AggregatorCronTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php rename to core/modules/aggregator/src/Tests/AggregatorCronTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php rename to core/modules/aggregator/src/Tests/AggregatorRenderingTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php rename to core/modules/aggregator/src/Tests/AggregatorTestBase.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php b/core/modules/aggregator/src/Tests/CategorizeFeedItemTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php rename to core/modules/aggregator/src/Tests/CategorizeFeedItemTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php b/core/modules/aggregator/src/Tests/CategorizeFeedTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php rename to core/modules/aggregator/src/Tests/CategorizeFeedTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedFetcherPluginTest.php rename to core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedLanguageTest.php b/core/modules/aggregator/src/Tests/FeedLanguageTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedLanguageTest.php rename to core/modules/aggregator/src/Tests/FeedLanguageTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php rename to core/modules/aggregator/src/Tests/FeedParserTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedProcessorPluginTest.php rename to core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php rename to core/modules/aggregator/src/Tests/ImportOpmlTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php b/core/modules/aggregator/src/Tests/RemoveFeedItemTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php rename to core/modules/aggregator/src/Tests/RemoveFeedItemTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php b/core/modules/aggregator/src/Tests/RemoveFeedTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php rename to core/modules/aggregator/src/Tests/RemoveFeedTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php rename to core/modules/aggregator/src/Tests/UpdateFeedItemTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php b/core/modules/aggregator/src/Tests/UpdateFeedTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php rename to core/modules/aggregator/src/Tests/UpdateFeedTest.php diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php similarity index 100% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php rename to core/modules/aggregator/src/Tests/Views/IntegrationTest.php diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php similarity index 100% rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php rename to core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php similarity index 100% rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php rename to core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php similarity index 100% rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php rename to core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php diff --git a/core/modules/aggregator/tests/Drupal/aggregator/Tests/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php similarity index 100% rename from core/modules/aggregator/tests/Drupal/aggregator/Tests/Plugin/AggregatorPluginSettingsBaseTest.php rename to core/modules/aggregator/tests/src/Plugin/AggregatorPluginSettingsBaseTest.php diff --git a/core/modules/ban/lib/Drupal/ban/BanIpManager.php b/core/modules/ban/src/BanIpManager.php similarity index 100% rename from core/modules/ban/lib/Drupal/ban/BanIpManager.php rename to core/modules/ban/src/BanIpManager.php diff --git a/core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php b/core/modules/ban/src/EventSubscriber/BanSubscriber.php similarity index 100% rename from core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php rename to core/modules/ban/src/EventSubscriber/BanSubscriber.php diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php b/core/modules/ban/src/Form/BanAdmin.php similarity index 100% rename from core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php rename to core/modules/ban/src/Form/BanAdmin.php diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php b/core/modules/ban/src/Form/BanDelete.php similarity index 100% rename from core/modules/ban/lib/Drupal/ban/Form/BanDelete.php rename to core/modules/ban/src/Form/BanDelete.php diff --git a/core/modules/ban/lib/Drupal/ban/Tests/IpAddressBlockingTest.php b/core/modules/ban/src/Tests/IpAddressBlockingTest.php similarity index 100% rename from core/modules/ban/lib/Drupal/ban/Tests/IpAddressBlockingTest.php rename to core/modules/ban/src/Tests/IpAddressBlockingTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/src/Controller/CustomBlockController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php rename to core/modules/block/custom_block/src/Controller/CustomBlockController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockAccessController.php b/core/modules/block/custom_block/src/CustomBlockAccessController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockAccessController.php rename to core/modules/block/custom_block/src/CustomBlockAccessController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php b/core/modules/block/custom_block/src/CustomBlockFormController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php rename to core/modules/block/custom_block/src/CustomBlockFormController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php b/core/modules/block/custom_block/src/CustomBlockInterface.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php rename to core/modules/block/custom_block/src/CustomBlockInterface.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php b/core/modules/block/custom_block/src/CustomBlockListController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php rename to core/modules/block/custom_block/src/CustomBlockListController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php b/core/modules/block/custom_block/src/CustomBlockRenderController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php rename to core/modules/block/custom_block/src/CustomBlockRenderController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php b/core/modules/block/custom_block/src/CustomBlockStorageController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php rename to core/modules/block/custom_block/src/CustomBlockStorageController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTranslationController.php b/core/modules/block/custom_block/src/CustomBlockTranslationController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTranslationController.php rename to core/modules/block/custom_block/src/CustomBlockTranslationController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeAccessController.php b/core/modules/block/custom_block/src/CustomBlockTypeAccessController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeAccessController.php rename to core/modules/block/custom_block/src/CustomBlockTypeAccessController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php b/core/modules/block/custom_block/src/CustomBlockTypeFormController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php rename to core/modules/block/custom_block/src/CustomBlockTypeFormController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php b/core/modules/block/custom_block/src/CustomBlockTypeInterface.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php rename to core/modules/block/custom_block/src/CustomBlockTypeInterface.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php b/core/modules/block/custom_block/src/CustomBlockTypeListController.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php rename to core/modules/block/custom_block/src/CustomBlockTypeListController.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/src/Entity/CustomBlock.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php rename to core/modules/block/custom_block/src/Entity/CustomBlock.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php b/core/modules/block/custom_block/src/Entity/CustomBlockType.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php rename to core/modules/block/custom_block/src/Entity/CustomBlockType.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php b/core/modules/block/custom_block/src/Form/CustomBlockDeleteForm.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php rename to core/modules/block/custom_block/src/Form/CustomBlockDeleteForm.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php b/core/modules/block/custom_block/src/Form/CustomBlockTypeDeleteForm.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php rename to core/modules/block/custom_block/src/Form/CustomBlockTypeDeleteForm.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/src/Plugin/Block/CustomBlockBlock.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php rename to core/modules/block/custom_block/src/Plugin/Block/CustomBlockBlock.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Derivative/CustomBlock.php b/core/modules/block/custom_block/src/Plugin/Derivative/CustomBlock.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Derivative/CustomBlock.php rename to core/modules/block/custom_block/src/Plugin/Derivative/CustomBlock.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockBuildContentTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockBuildContentTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockBuildContentTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockBuildContentTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockCreationTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockCreationTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockFieldTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockFieldTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockListTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockListTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockLoadHooksTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockLoadHooksTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockLoadHooksTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockLoadHooksTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockPageViewTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockPageViewTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockPageViewTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockPageViewTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockRevisionsTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockRevisionsTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockRevisionsTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockRevisionsTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockSaveTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockSaveTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php b/core/modules/block/custom_block/src/Tests/CustomBlockTestBase.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php rename to core/modules/block/custom_block/src/Tests/CustomBlockTestBase.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php b/core/modules/block/custom_block/src/Tests/CustomBlockTranslationUITest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockTranslationUITest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php b/core/modules/block/custom_block/src/Tests/CustomBlockTypeTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php rename to core/modules/block/custom_block/src/Tests/CustomBlockTypeTest.php diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php b/core/modules/block/custom_block/src/Tests/PageEditTest.php similarity index 100% rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php rename to core/modules/block/custom_block/src/Tests/PageEditTest.php diff --git a/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php b/core/modules/block/src/Access/BlockThemeAccessCheck.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php rename to core/modules/block/src/Access/BlockThemeAccessCheck.php diff --git a/core/modules/block/lib/Drupal/block/Annotation/Block.php b/core/modules/block/src/Annotation/Block.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Annotation/Block.php rename to core/modules/block/src/Annotation/Block.php diff --git a/core/modules/block/lib/Drupal/block/BlockAccessController.php b/core/modules/block/src/BlockAccessController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockAccessController.php rename to core/modules/block/src/BlockAccessController.php diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/src/BlockBase.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockBase.php rename to core/modules/block/src/BlockBase.php diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/src/BlockFormController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockFormController.php rename to core/modules/block/src/BlockFormController.php diff --git a/core/modules/block/lib/Drupal/block/BlockInterface.php b/core/modules/block/src/BlockInterface.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockInterface.php rename to core/modules/block/src/BlockInterface.php diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/src/BlockListController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockListController.php rename to core/modules/block/src/BlockListController.php diff --git a/core/modules/block/lib/Drupal/block/BlockPluginBag.php b/core/modules/block/src/BlockPluginBag.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockPluginBag.php rename to core/modules/block/src/BlockPluginBag.php diff --git a/core/modules/block/lib/Drupal/block/BlockPluginInterface.php b/core/modules/block/src/BlockPluginInterface.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockPluginInterface.php rename to core/modules/block/src/BlockPluginInterface.php diff --git a/core/modules/block/lib/Drupal/block/BlockRenderController.php b/core/modules/block/src/BlockRenderController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockRenderController.php rename to core/modules/block/src/BlockRenderController.php diff --git a/core/modules/block/lib/Drupal/block/BlockStorageController.php b/core/modules/block/src/BlockStorageController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/BlockStorageController.php rename to core/modules/block/src/BlockStorageController.php diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockAddController.php b/core/modules/block/src/Controller/BlockAddController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Controller/BlockAddController.php rename to core/modules/block/src/Controller/BlockAddController.php diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php b/core/modules/block/src/Controller/BlockListController.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Controller/BlockListController.php rename to core/modules/block/src/Controller/BlockListController.php diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/src/Entity/Block.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Entity/Block.php rename to core/modules/block/src/Entity/Block.php diff --git a/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php b/core/modules/block/src/Form/BlockDeleteForm.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php rename to core/modules/block/src/Form/BlockDeleteForm.php diff --git a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php b/core/modules/block/src/Plugin/Type/BlockManager.php similarity index 89% rename from core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php rename to core/modules/block/src/Plugin/Type/BlockManager.php index ead5531..0bc661e 100644 --- a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php +++ b/core/modules/block/src/Plugin/Type/BlockManager.php @@ -35,8 +35,8 @@ class BlockManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\block\Annotation' => $namespaces['Drupal\block']); - parent::__construct('Plugin/Block', $namespaces, $annotation_namespaces, 'Drupal\block\Annotation\Block'); + parent::__construct($namespaces, 'Plugin\Block', 'Drupal\block\Annotation\Block'); + $this->addAnnotationNamespace('Drupal\block\Annotation'); $this->alterInfo($module_handler, 'block'); $this->setCacheBackend($cache_backend, $language_manager, 'block_plugins'); } diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/src/Plugin/views/display/Block.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php rename to core/modules/block/src/Plugin/views/display/Block.php diff --git a/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php b/core/modules/block/src/Routing/RouteSubscriber.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php rename to core/modules/block/src/Routing/RouteSubscriber.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php b/core/modules/block/src/Tests/BlockAdminThemeTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php rename to core/modules/block/src/Tests/BlockAdminThemeTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php b/core/modules/block/src/Tests/BlockCacheTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php rename to core/modules/block/src/Tests/BlockCacheTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHiddenRegionTest.php b/core/modules/block/src/Tests/BlockHiddenRegionTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockHiddenRegionTest.php rename to core/modules/block/src/Tests/BlockHiddenRegionTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHookOperationTest.php b/core/modules/block/src/Tests/BlockHookOperationTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockHookOperationTest.php rename to core/modules/block/src/Tests/BlockHookOperationTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php b/core/modules/block/src/Tests/BlockHtmlIdTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php rename to core/modules/block/src/Tests/BlockHtmlIdTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php rename to core/modules/block/src/Tests/BlockInterfaceTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInvalidRegionTest.php b/core/modules/block/src/Tests/BlockInvalidRegionTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockInvalidRegionTest.php rename to core/modules/block/src/Tests/BlockInvalidRegionTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php b/core/modules/block/src/Tests/BlockLanguageCacheTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php rename to core/modules/block/src/Tests/BlockLanguageCacheTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php b/core/modules/block/src/Tests/BlockLanguageTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php rename to core/modules/block/src/Tests/BlockLanguageTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php b/core/modules/block/src/Tests/BlockRenderOrderTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php rename to core/modules/block/src/Tests/BlockRenderOrderTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/src/Tests/BlockStorageUnitTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php rename to core/modules/block/src/Tests/BlockStorageUnitTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php b/core/modules/block/src/Tests/BlockTemplateSuggestionsUnitTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php rename to core/modules/block/src/Tests/BlockTemplateSuggestionsUnitTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockTest.php rename to core/modules/block/src/Tests/BlockTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php rename to core/modules/block/src/Tests/BlockTestBase.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTitleXSSTest.php b/core/modules/block/src/Tests/BlockTitleXSSTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockTitleXSSTest.php rename to core/modules/block/src/Tests/BlockTitleXSSTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php rename to core/modules/block/src/Tests/BlockUiTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/NewDefaultThemeBlocksTest.php b/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/NewDefaultThemeBlocksTest.php rename to core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/NonDefaultBlockAdminTest.php rename to core/modules/block/src/Tests/NonDefaultBlockAdminTest.php diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php similarity index 100% rename from core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php rename to core/modules/block/src/Tests/Views/DisplayBlockTest.php diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php similarity index 100% rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php rename to core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php similarity index 100% rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php rename to core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlIdBlock.php similarity index 100% rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php rename to core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlIdBlock.php diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestXSSTitleBlock.php similarity index 100% rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php rename to core/modules/block/tests/modules/block_test/src/Plugin/Block/TestXSSTitleBlock.php diff --git a/core/modules/book/lib/Drupal/book/BookExport.php b/core/modules/book/src/BookExport.php similarity index 100% rename from core/modules/book/lib/Drupal/book/BookExport.php rename to core/modules/book/src/BookExport.php diff --git a/core/modules/book/lib/Drupal/book/BookManager.php b/core/modules/book/src/BookManager.php similarity index 100% rename from core/modules/book/lib/Drupal/book/BookManager.php rename to core/modules/book/src/BookManager.php diff --git a/core/modules/book/lib/Drupal/book/Controller/BookController.php b/core/modules/book/src/Controller/BookController.php similarity index 100% rename from core/modules/book/lib/Drupal/book/Controller/BookController.php rename to core/modules/book/src/Controller/BookController.php diff --git a/core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php b/core/modules/book/src/Form/BookSettingsForm.php similarity index 100% rename from core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php rename to core/modules/book/src/Form/BookSettingsForm.php diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php similarity index 100% rename from core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php rename to core/modules/book/src/Plugin/Block/BookNavigationBlock.php diff --git a/core/modules/book/lib/Drupal/book/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php similarity index 100% rename from core/modules/book/lib/Drupal/book/Tests/BookTest.php rename to core/modules/book/src/Tests/BookTest.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php b/core/modules/breakpoint/src/BreakpointGroupInterface.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php rename to core/modules/breakpoint/src/BreakpointGroupInterface.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php b/core/modules/breakpoint/src/BreakpointInterface.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php rename to core/modules/breakpoint/src/BreakpointInterface.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php b/core/modules/breakpoint/src/Entity/Breakpoint.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php rename to core/modules/breakpoint/src/Entity/Breakpoint.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/src/Entity/BreakpointGroup.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php rename to core/modules/breakpoint/src/Entity/BreakpointGroup.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointException.php b/core/modules/breakpoint/src/InvalidBreakpointException.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointException.php rename to core/modules/breakpoint/src/InvalidBreakpointException.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointMediaQueryException.php b/core/modules/breakpoint/src/InvalidBreakpointMediaQueryException.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointMediaQueryException.php rename to core/modules/breakpoint/src/InvalidBreakpointMediaQueryException.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointNameException.php b/core/modules/breakpoint/src/InvalidBreakpointNameException.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointNameException.php rename to core/modules/breakpoint/src/InvalidBreakpointNameException.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceException.php b/core/modules/breakpoint/src/InvalidBreakpointSourceException.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceException.php rename to core/modules/breakpoint/src/InvalidBreakpointSourceException.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceTypeException.php b/core/modules/breakpoint/src/InvalidBreakpointSourceTypeException.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceTypeException.php rename to core/modules/breakpoint/src/InvalidBreakpointSourceTypeException.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php b/core/modules/breakpoint/src/Tests/BreakpointAPITest.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php rename to core/modules/breakpoint/src/Tests/BreakpointAPITest.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php b/core/modules/breakpoint/src/Tests/BreakpointCRUDTest.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php rename to core/modules/breakpoint/src/Tests/BreakpointCRUDTest.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php b/core/modules/breakpoint/src/Tests/BreakpointGroupAPITest.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php rename to core/modules/breakpoint/src/Tests/BreakpointGroupAPITest.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php b/core/modules/breakpoint/src/Tests/BreakpointGroupCRUDTest.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php rename to core/modules/breakpoint/src/Tests/BreakpointGroupCRUDTest.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php b/core/modules/breakpoint/src/Tests/BreakpointGroupTestBase.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php rename to core/modules/breakpoint/src/Tests/BreakpointGroupTestBase.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php b/core/modules/breakpoint/src/Tests/BreakpointTestBase.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php rename to core/modules/breakpoint/src/Tests/BreakpointTestBase.php diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/src/Tests/BreakpointThemeTest.php similarity index 100% rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php rename to core/modules/breakpoint/src/Tests/BreakpointThemeTest.php diff --git a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php b/core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php similarity index 100% rename from core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php rename to core/modules/breakpoint/tests/src/BreakpointMediaQueryTest.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php b/core/modules/ckeditor/src/Annotation/CKEditorPlugin.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php rename to core/modules/ckeditor/src/Annotation/CKEditorPlugin.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php b/core/modules/ckeditor/src/CKEditorPluginBase.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php rename to core/modules/ckeditor/src/CKEditorPluginBase.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginButtonsInterface.php b/core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginButtonsInterface.php rename to core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php b/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php rename to core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php b/core/modules/ckeditor/src/CKEditorPluginContextualInterface.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php rename to core/modules/ckeditor/src/CKEditorPluginContextualInterface.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php b/core/modules/ckeditor/src/CKEditorPluginInterface.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php rename to core/modules/ckeditor/src/CKEditorPluginInterface.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php b/core/modules/ckeditor/src/CKEditorPluginManager.php similarity index 96% rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php rename to core/modules/ckeditor/src/CKEditorPluginManager.php index dc69f7e..f26238e 100644 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php +++ b/core/modules/ckeditor/src/CKEditorPluginManager.php @@ -33,8 +33,8 @@ class CKEditorPluginManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\ckeditor\Annotation' => $namespaces['Drupal\ckeditor']); - parent::__construct('Plugin/CKEditorPlugin', $namespaces, $annotation_namespaces, 'Drupal\ckeditor\Annotation\CKEditorPlugin'); + parent::__construct($namespaces, 'Plugin\CKEditorPlugin', 'Drupal\ckeditor\Annotation\CKEditorPlugin'); + $this->addAnnotationNamespace('Drupal\ckeditor\Annotation'); $this->alterInfo($module_handler, 'ckeditor_plugin_info'); $this->setCacheBackend($cache_backend, $language_manager, 'ckeditor_plugin'); } diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php rename to core/modules/ckeditor/src/Plugin/Editor/CKEditor.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php rename to core/modules/ckeditor/src/Tests/CKEditorAdminTest.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php rename to core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php rename to core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php similarity index 100% rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php rename to core/modules/ckeditor/src/Tests/CKEditorTest.php diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php similarity index 100% rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php rename to core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php similarity index 100% rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php rename to core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php similarity index 100% rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php rename to core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php similarity index 100% rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php rename to core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/src/Tests/ColorTest.php similarity index 100% rename from core/modules/color/lib/Drupal/color/Tests/ColorTest.php rename to core/modules/color/src/Tests/ColorTest.php diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install index 04e1291..0ff09b1 100644 --- a/core/modules/comment/comment.install +++ b/core/modules/comment/comment.install @@ -13,7 +13,11 @@ function comment_uninstall() { variable_del('comment_block_count'); $node_types = array_keys(node_type_get_types()); Drupal::entityManager()->addNamespaces(new ArrayIterator(array( - 'Drupal\comment' => DRUPAL_ROOT . '/core/modules/comment/lib', + 'Drupal\comment' => array( + DRUPAL_ROOT . '/core/modules/comment/lib/Drupal/comment', + DRUPAL_ROOT . '/core/modules/comment/lib', + DRUPAL_ROOT . '/core/modules/comment/src', + ), ))); drupal_classloader_register('comment', 'core/modules/comment'); foreach ($node_types as $node_type) { diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php b/core/modules/comment/src/CommentAccessController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentAccessController.php rename to core/modules/comment/src/CommentAccessController.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/src/CommentFormController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentFormController.php rename to core/modules/comment/src/CommentFormController.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentInterface.php b/core/modules/comment/src/CommentInterface.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentInterface.php rename to core/modules/comment/src/CommentInterface.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentNewItem.php b/core/modules/comment/src/CommentNewItem.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentNewItem.php rename to core/modules/comment/src/CommentNewItem.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentNewValue.php b/core/modules/comment/src/CommentNewValue.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentNewValue.php rename to core/modules/comment/src/CommentNewValue.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php b/core/modules/comment/src/CommentRenderController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentRenderController.php rename to core/modules/comment/src/CommentRenderController.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php b/core/modules/comment/src/CommentStorageController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentStorageController.php rename to core/modules/comment/src/CommentStorageController.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageControllerInterface.php b/core/modules/comment/src/CommentStorageControllerInterface.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentStorageControllerInterface.php rename to core/modules/comment/src/CommentStorageControllerInterface.php diff --git a/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php b/core/modules/comment/src/CommentTranslationController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/CommentTranslationController.php rename to core/modules/comment/src/CommentTranslationController.php diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Controller/CommentController.php rename to core/modules/comment/src/Controller/CommentController.php diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Entity/Comment.php rename to core/modules/comment/src/Entity/Comment.php diff --git a/core/modules/comment/lib/Drupal/comment/Form/ConfirmDeleteMultiple.php b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Form/ConfirmDeleteMultiple.php rename to core/modules/comment/src/Form/ConfirmDeleteMultiple.php diff --git a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php b/core/modules/comment/src/Form/DeleteForm.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php rename to core/modules/comment/src/Form/DeleteForm.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php b/core/modules/comment/src/Plugin/Action/PublishComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php rename to core/modules/comment/src/Plugin/Action/PublishComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php b/core/modules/comment/src/Plugin/Action/SaveComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php rename to core/modules/comment/src/Plugin/Action/SaveComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php rename to core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php b/core/modules/comment/src/Plugin/Action/UnpublishComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php rename to core/modules/comment/src/Plugin/Action/UnpublishComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php b/core/modules/comment/src/Plugin/Block/RecentCommentsBlock.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php rename to core/modules/comment/src/Plugin/Block/RecentCommentsBlock.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php b/core/modules/comment/src/Plugin/entity_reference/selection/CommentSelection.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php rename to core/modules/comment/src/Plugin/entity_reference/selection/CommentSelection.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/src/Plugin/views/argument/UserUid.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php rename to core/modules/comment/src/Plugin/views/argument/UserUid.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/src/Plugin/views/field/Comment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php rename to core/modules/comment/src/Plugin/views/field/Comment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/src/Plugin/views/field/Depth.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php rename to core/modules/comment/src/Plugin/views/field/Depth.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/src/Plugin/views/field/LastTimestamp.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php rename to core/modules/comment/src/Plugin/views/field/LastTimestamp.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php b/core/modules/comment/src/Plugin/views/field/Link.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php rename to core/modules/comment/src/Plugin/views/field/Link.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/src/Plugin/views/field/LinkApprove.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php rename to core/modules/comment/src/Plugin/views/field/LinkApprove.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/src/Plugin/views/field/LinkDelete.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php rename to core/modules/comment/src/Plugin/views/field/LinkDelete.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/src/Plugin/views/field/LinkEdit.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php rename to core/modules/comment/src/Plugin/views/field/LinkEdit.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/src/Plugin/views/field/LinkReply.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php rename to core/modules/comment/src/Plugin/views/field/LinkReply.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/src/Plugin/views/field/NcsLastCommentName.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php rename to core/modules/comment/src/Plugin/views/field/NcsLastCommentName.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/src/Plugin/views/field/NcsLastUpdated.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php rename to core/modules/comment/src/Plugin/views/field/NcsLastUpdated.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/src/Plugin/views/field/NodeComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php rename to core/modules/comment/src/Plugin/views/field/NodeComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php b/core/modules/comment/src/Plugin/views/field/NodeLink.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php rename to core/modules/comment/src/Plugin/views/field/NodeLink.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php rename to core/modules/comment/src/Plugin/views/field/NodeNewComments.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/src/Plugin/views/field/Username.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php rename to core/modules/comment/src/Plugin/views/field/Username.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php b/core/modules/comment/src/Plugin/views/filter/NcsLastUpdated.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php rename to core/modules/comment/src/Plugin/views/filter/NcsLastUpdated.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/src/Plugin/views/filter/NodeComment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php rename to core/modules/comment/src/Plugin/views/filter/NodeComment.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/src/Plugin/views/filter/UserUid.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php rename to core/modules/comment/src/Plugin/views/filter/UserUid.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php b/core/modules/comment/src/Plugin/views/row/CommentRow.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php rename to core/modules/comment/src/Plugin/views/row/CommentRow.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php rename to core/modules/comment/src/Plugin/views/row/Rss.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/src/Plugin/views/sort/NcsLastCommentName.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php rename to core/modules/comment/src/Plugin/views/sort/NcsLastCommentName.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php b/core/modules/comment/src/Plugin/views/sort/NcsLastUpdated.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php rename to core/modules/comment/src/Plugin/views/sort/NcsLastUpdated.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php b/core/modules/comment/src/Plugin/views/sort/Thread.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php rename to core/modules/comment/src/Plugin/views/sort/Thread.php diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php rename to core/modules/comment/src/Plugin/views/wizard/Comment.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php b/core/modules/comment/src/Tests/CommentActionsTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php rename to core/modules/comment/src/Tests/CommentActionsTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php b/core/modules/comment/src/Tests/CommentAnonymousTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php rename to core/modules/comment/src/Tests/CommentAnonymousTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php b/core/modules/comment/src/Tests/CommentApprovalTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php rename to core/modules/comment/src/Tests/CommentApprovalTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php rename to core/modules/comment/src/Tests/CommentBlockTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php b/core/modules/comment/src/Tests/CommentCSSTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php rename to core/modules/comment/src/Tests/CommentCSSTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php b/core/modules/comment/src/Tests/CommentContentRebuildTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php rename to core/modules/comment/src/Tests/CommentContentRebuildTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php rename to core/modules/comment/src/Tests/CommentFieldsTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php rename to core/modules/comment/src/Tests/CommentInterfaceTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php rename to core/modules/comment/src/Tests/CommentLanguageTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php b/core/modules/comment/src/Tests/CommentLinksTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php rename to core/modules/comment/src/Tests/CommentLinksTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php rename to core/modules/comment/src/Tests/CommentNewIndicatorTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php b/core/modules/comment/src/Tests/CommentNodeAccessTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php rename to core/modules/comment/src/Tests/CommentNodeAccessTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php b/core/modules/comment/src/Tests/CommentNodeChangesTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php rename to core/modules/comment/src/Tests/CommentNodeChangesTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php rename to core/modules/comment/src/Tests/CommentPagerTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php rename to core/modules/comment/src/Tests/CommentPreviewTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php b/core/modules/comment/src/Tests/CommentRssTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php rename to core/modules/comment/src/Tests/CommentRssTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php b/core/modules/comment/src/Tests/CommentStatisticsTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php rename to core/modules/comment/src/Tests/CommentStatisticsTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php rename to core/modules/comment/src/Tests/CommentTestBase.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/src/Tests/CommentThreadingTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php rename to core/modules/comment/src/Tests/CommentThreadingTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php rename to core/modules/comment/src/Tests/CommentTokenReplaceTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php rename to core/modules/comment/src/Tests/CommentTranslationUITest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php b/core/modules/comment/src/Tests/CommentUninstallTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php rename to core/modules/comment/src/Tests/CommentUninstallTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php b/core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php rename to core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentRowTest.php b/core/modules/comment/src/Tests/Views/CommentRowTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/CommentRowTest.php rename to core/modules/comment/src/Tests/Views/CommentRowTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php b/core/modules/comment/src/Tests/Views/CommentTestBase.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php rename to core/modules/comment/src/Tests/Views/CommentTestBase.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentComments.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php rename to core/modules/comment/src/Tests/Views/DefaultViewRecentComments.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/src/Tests/Views/FilterUserUIDTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php rename to core/modules/comment/src/Tests/Views/FilterUserUIDTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php b/core/modules/comment/src/Tests/Views/RowRssTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php rename to core/modules/comment/src/Tests/Views/RowRssTest.php diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php b/core/modules/comment/src/Tests/Views/WizardTest.php similarity index 100% rename from core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php rename to core/modules/comment/src/Tests/Views/WizardTest.php diff --git a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Controller/ConfigController.php rename to core/modules/config/src/Controller/ConfigController.php diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigExportForm.php b/core/modules/config/src/Form/ConfigExportForm.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Form/ConfigExportForm.php rename to core/modules/config/src/Form/ConfigExportForm.php diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php b/core/modules/config/src/Form/ConfigImportForm.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php rename to core/modules/config/src/Form/ConfigImportForm.php diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Form/ConfigSync.php rename to core/modules/config/src/Form/ConfigSync.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/src/Tests/ConfigCRUDTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php rename to core/modules/config/src/Tests/ConfigCRUDTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigDiffTest.php b/core/modules/config/src/Tests/ConfigDiffTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigDiffTest.php rename to core/modules/config/src/Tests/ConfigDiffTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/src/Tests/ConfigEntityListTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php rename to core/modules/config/src/Tests/ConfigEntityListTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusTest.php b/core/modules/config/src/Tests/ConfigEntityStatusTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusTest.php rename to core/modules/config/src/Tests/ConfigEntityStatusTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php b/core/modules/config/src/Tests/ConfigEntityStatusUITest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php rename to core/modules/config/src/Tests/ConfigEntityStatusUITest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStorageControllerTest.php b/core/modules/config/src/Tests/ConfigEntityStorageControllerTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStorageControllerTest.php rename to core/modules/config/src/Tests/ConfigEntityStorageControllerTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php rename to core/modules/config/src/Tests/ConfigEntityTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php b/core/modules/config/src/Tests/ConfigEntityUnitTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php rename to core/modules/config/src/Tests/ConfigEntityUnitTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php b/core/modules/config/src/Tests/ConfigExportUITest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php rename to core/modules/config/src/Tests/ConfigExportUITest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php b/core/modules/config/src/Tests/ConfigFileContentTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php rename to core/modules/config/src/Tests/ConfigFileContentTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php rename to core/modules/config/src/Tests/ConfigImportUITest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUploadTest.php b/core/modules/config/src/Tests/ConfigImportUploadTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigImportUploadTest.php rename to core/modules/config/src/Tests/ConfigImportUploadTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php rename to core/modules/config/src/Tests/ConfigImporterTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallTest.php b/core/modules/config/src/Tests/ConfigInstallTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigInstallTest.php rename to core/modules/config/src/Tests/ConfigInstallTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php b/core/modules/config/src/Tests/ConfigInstallWebTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php rename to core/modules/config/src/Tests/ConfigInstallWebTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php b/core/modules/config/src/Tests/ConfigLocaleOverride.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php rename to core/modules/config/src/Tests/ConfigLocaleOverride.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverrideWebTest.php b/core/modules/config/src/Tests/ConfigLocaleOverrideWebTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverrideWebTest.php rename to core/modules/config/src/Tests/ConfigLocaleOverrideWebTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php b/core/modules/config/src/Tests/ConfigOverrideTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php rename to core/modules/config/src/Tests/ConfigOverrideTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php b/core/modules/config/src/Tests/ConfigSchemaTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php rename to core/modules/config/src/Tests/ConfigSchemaTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSnapshotTest.php b/core/modules/config/src/Tests/ConfigSnapshotTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigSnapshotTest.php rename to core/modules/config/src/Tests/ConfigSnapshotTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigUpgradeTest.php b/core/modules/config/src/Tests/ConfigUpgradeTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/ConfigUpgradeTest.php rename to core/modules/config/src/Tests/ConfigUpgradeTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php rename to core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php rename to core/modules/config/src/Tests/Storage/DatabaseStorageTest.php diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php b/core/modules/config/src/Tests/Storage/FileStorageTest.php similarity index 100% rename from core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php rename to core/modules/config/src/Tests/Storage/FileStorageTest.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php b/core/modules/config/tests/config_test/src/ConfigTestAccessController.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php rename to core/modules/config/tests/config_test/src/ConfigTestAccessController.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/src/ConfigTestController.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php rename to core/modules/config/tests/config_test/src/ConfigTestController.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestFormController.php b/core/modules/config/tests/config_test/src/ConfigTestFormController.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestFormController.php rename to core/modules/config/tests/config_test/src/ConfigTestFormController.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php b/core/modules/config/tests/config_test/src/ConfigTestInterface.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php rename to core/modules/config/tests/config_test/src/ConfigTestInterface.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php b/core/modules/config/tests/config_test/src/ConfigTestListController.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php rename to core/modules/config/tests/config_test/src/ConfigTestListController.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestStorageController.php b/core/modules/config/tests/config_test/src/ConfigTestStorageController.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestStorageController.php rename to core/modules/config/tests/config_test/src/ConfigTestStorageController.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php rename to core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php rename to core/modules/config/tests/config_test/src/Entity/ConfigTest.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php b/core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php rename to core/modules/config/tests/config_test/src/Form/ConfigTestDeleteForm.php diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php b/core/modules/config/tests/config_test/src/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php similarity index 100% rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php rename to core/modules/config/tests/config_test/src/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php diff --git a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php b/core/modules/contact/src/CategoryAccessController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/CategoryAccessController.php rename to core/modules/contact/src/CategoryAccessController.php diff --git a/core/modules/contact/lib/Drupal/contact/CategoryFormController.php b/core/modules/contact/src/CategoryFormController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/CategoryFormController.php rename to core/modules/contact/src/CategoryFormController.php diff --git a/core/modules/contact/lib/Drupal/contact/CategoryInterface.php b/core/modules/contact/src/CategoryInterface.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/CategoryInterface.php rename to core/modules/contact/src/CategoryInterface.php diff --git a/core/modules/contact/lib/Drupal/contact/CategoryListController.php b/core/modules/contact/src/CategoryListController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/CategoryListController.php rename to core/modules/contact/src/CategoryListController.php diff --git a/core/modules/contact/lib/Drupal/contact/CategoryStorageController.php b/core/modules/contact/src/CategoryStorageController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/CategoryStorageController.php rename to core/modules/contact/src/CategoryStorageController.php diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Category.php b/core/modules/contact/src/Entity/Category.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Entity/Category.php rename to core/modules/contact/src/Entity/Category.php diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Message.php b/core/modules/contact/src/Entity/Message.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Entity/Message.php rename to core/modules/contact/src/Entity/Message.php diff --git a/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php b/core/modules/contact/src/Form/CategoryDeleteForm.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php rename to core/modules/contact/src/Form/CategoryDeleteForm.php diff --git a/core/modules/contact/lib/Drupal/contact/MessageFormController.php b/core/modules/contact/src/MessageFormController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/MessageFormController.php rename to core/modules/contact/src/MessageFormController.php diff --git a/core/modules/contact/lib/Drupal/contact/MessageInterface.php b/core/modules/contact/src/MessageInterface.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/MessageInterface.php rename to core/modules/contact/src/MessageInterface.php diff --git a/core/modules/contact/lib/Drupal/contact/MessageRenderController.php b/core/modules/contact/src/MessageRenderController.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/MessageRenderController.php rename to core/modules/contact/src/MessageRenderController.php diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php b/core/modules/contact/src/Plugin/views/field/ContactLink.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php rename to core/modules/contact/src/Plugin/views/field/ContactLink.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/ContactAuthenticatedUserTest.php rename to core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php b/core/modules/contact/src/Tests/ContactPersonalTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php rename to core/modules/contact/src/Tests/ContactPersonalTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php rename to core/modules/contact/src/Tests/ContactSitewideTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactUpgradePathTest.php b/core/modules/contact/src/Tests/ContactUpgradePathTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/ContactUpgradePathTest.php rename to core/modules/contact/src/Tests/ContactUpgradePathTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php b/core/modules/contact/src/Tests/MessageEntityTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php rename to core/modules/contact/src/Tests/MessageEntityTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/src/Tests/Views/ContactFieldsTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php rename to core/modules/contact/src/Tests/Views/ContactFieldsTest.php diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php b/core/modules/contact/src/Tests/Views/ContactLinkTest.php similarity index 100% rename from core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php rename to core/modules/contact/src/Tests/Views/ContactLinkTest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/src/ContentTranslationController.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php rename to core/modules/content_translation/src/ContentTranslationController.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerInterface.php b/core/modules/content_translation/src/ContentTranslationControllerInterface.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerInterface.php rename to core/modules/content_translation/src/ContentTranslationControllerInterface.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerNG.php b/core/modules/content_translation/src/ContentTranslationControllerNG.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerNG.php rename to core/modules/content_translation/src/ContentTranslationControllerNG.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php b/core/modules/content_translation/src/FieldTranslationSynchronizer.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php rename to core/modules/content_translation/src/FieldTranslationSynchronizer.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizerInterface.php b/core/modules/content_translation/src/FieldTranslationSynchronizerInterface.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizerInterface.php rename to core/modules/content_translation/src/FieldTranslationSynchronizerInterface.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php b/core/modules/content_translation/src/Form/TranslatableForm.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php rename to core/modules/content_translation/src/Form/TranslatableForm.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php b/core/modules/content_translation/src/Plugin/views/field/TranslationLink.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php rename to core/modules/content_translation/src/Plugin/views/field/TranslationLink.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ConfigTestTranslationUITest.php b/core/modules/content_translation/src/Tests/ConfigTestTranslationUITest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ConfigTestTranslationUITest.php rename to core/modules/content_translation/src/Tests/ConfigTestTranslationUITest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTestTranslationUITest.php b/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTestTranslationUITest.php rename to core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php rename to core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php rename to core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php rename to core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php rename to core/modules/content_translation/src/Tests/ContentTranslationTestBase.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php b/core/modules/content_translation/src/Tests/ContentTranslationUITest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php rename to core/modules/content_translation/src/Tests/ContentTranslationUITest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php rename to core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/ContentTranslationViewsUITest.php b/core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/ContentTranslationViewsUITest.php rename to core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php b/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php similarity index 100% rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php rename to core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php diff --git a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php b/core/modules/contextual/src/ContextualController.php similarity index 100% rename from core/modules/contextual/lib/Drupal/contextual/ContextualController.php rename to core/modules/contextual/src/ContextualController.php diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php similarity index 100% rename from core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php rename to core/modules/contextual/src/Plugin/views/field/ContextualLinks.php diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php similarity index 100% rename from core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php rename to core/modules/contextual/src/Tests/ContextualDynamicContextTest.php diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php b/core/modules/contextual/src/Tests/ContextualUnitTest.php similarity index 100% rename from core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php rename to core/modules/contextual/src/Tests/ContextualUnitTest.php diff --git a/core/modules/datetime/lib/Drupal/datetime/DateHelper.php b/core/modules/datetime/src/DateHelper.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/DateHelper.php rename to core/modules/datetime/src/DateHelper.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/field_type/DateTimeItem.php b/core/modules/datetime/src/Plugin/field/field_type/DateTimeItem.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/field_type/DateTimeItem.php rename to core/modules/datetime/src/Plugin/field/field_type/DateTimeItem.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/src/Plugin/field/formatter/DatetimeDefaultFormatter.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php rename to core/modules/datetime/src/Plugin/field/formatter/DatetimeDefaultFormatter.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php b/core/modules/datetime/src/Plugin/field/formatter/DatetimePlainFormatter.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php rename to core/modules/datetime/src/Plugin/field/formatter/DatetimePlainFormatter.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php b/core/modules/datetime/src/Plugin/field/widget/DatetimeDatelistWidget.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php rename to core/modules/datetime/src/Plugin/field/widget/DatetimeDatelistWidget.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php b/core/modules/datetime/src/Plugin/field/widget/DatetimeDefaultWidget.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php rename to core/modules/datetime/src/Plugin/field/widget/DatetimeDefaultWidget.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php b/core/modules/datetime/src/Tests/DateTimeItemTest.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php rename to core/modules/datetime/src/Tests/DateTimeItemTest.php diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/src/Tests/DatetimeFieldTest.php similarity index 100% rename from core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php rename to core/modules/datetime/src/Tests/DatetimeFieldTest.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php rename to core/modules/dblog/src/Controller/DbLogController.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php b/core/modules/dblog/src/Plugin/views/field/DblogMessage.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php rename to core/modules/dblog/src/Plugin/views/field/DblogMessage.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php b/core/modules/dblog/src/Plugin/views/field/DblogOperations.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php rename to core/modules/dblog/src/Plugin/views/field/DblogOperations.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php rename to core/modules/dblog/src/Plugin/views/wizard/Watchdog.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php rename to core/modules/dblog/src/Tests/DbLogTest.php diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php similarity index 100% rename from core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php rename to core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/edit/src/Access/EditEntityAccessCheck.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php rename to core/modules/edit/src/Access/EditEntityAccessCheck.php diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/edit/src/Access/EditEntityFieldAccessCheck.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php rename to core/modules/edit/src/Access/EditEntityFieldAccessCheck.php diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php b/core/modules/edit/src/Access/EditEntityFieldAccessCheckInterface.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php rename to core/modules/edit/src/Access/EditEntityFieldAccessCheckInterface.php diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php b/core/modules/edit/src/Ajax/BaseCommand.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php rename to core/modules/edit/src/Ajax/BaseCommand.php diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php b/core/modules/edit/src/Ajax/EntitySavedCommand.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php rename to core/modules/edit/src/Ajax/EntitySavedCommand.php diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php b/core/modules/edit/src/Ajax/FieldFormCommand.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php rename to core/modules/edit/src/Ajax/FieldFormCommand.php diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php b/core/modules/edit/src/Ajax/FieldFormSavedCommand.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php rename to core/modules/edit/src/Ajax/FieldFormSavedCommand.php diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php b/core/modules/edit/src/Ajax/FieldFormValidationErrorsCommand.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php rename to core/modules/edit/src/Ajax/FieldFormValidationErrorsCommand.php diff --git a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php b/core/modules/edit/src/Annotation/InPlaceEditor.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php rename to core/modules/edit/src/Annotation/InPlaceEditor.php diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/src/EditController.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/EditController.php rename to core/modules/edit/src/EditController.php diff --git a/core/modules/edit/lib/Drupal/edit/EditPluginInterface.php b/core/modules/edit/src/EditPluginInterface.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/EditPluginInterface.php rename to core/modules/edit/src/EditPluginInterface.php diff --git a/core/modules/edit/lib/Drupal/edit/EditorBase.php b/core/modules/edit/src/EditorBase.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/EditorBase.php rename to core/modules/edit/src/EditorBase.php diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelector.php b/core/modules/edit/src/EditorSelector.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/EditorSelector.php rename to core/modules/edit/src/EditorSelector.php diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php b/core/modules/edit/src/EditorSelectorInterface.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php rename to core/modules/edit/src/EditorSelectorInterface.php diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/src/Form/EditFieldForm.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php rename to core/modules/edit/src/Form/EditFieldForm.php diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php b/core/modules/edit/src/MetadataGenerator.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/MetadataGenerator.php rename to core/modules/edit/src/MetadataGenerator.php diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php b/core/modules/edit/src/MetadataGeneratorInterface.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php rename to core/modules/edit/src/MetadataGeneratorInterface.php diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php b/core/modules/edit/src/Plugin/InPlaceEditor/DirectEditor.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php rename to core/modules/edit/src/Plugin/InPlaceEditor/DirectEditor.php diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/edit/src/Plugin/InPlaceEditor/FormEditor.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php rename to core/modules/edit/src/Plugin/InPlaceEditor/FormEditor.php diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php b/core/modules/edit/src/Plugin/InPlaceEditorManager.php similarity index 81% rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php rename to core/modules/edit/src/Plugin/InPlaceEditorManager.php index 79f8013..0e50ac7 100644 --- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php +++ b/core/modules/edit/src/Plugin/InPlaceEditorManager.php @@ -29,8 +29,8 @@ class InPlaceEditorManager extends PluginManagerBase { * keyed by the corresponding namespace to look for plugin implementations, */ public function __construct(\Traversable $namespaces) { - $annotation_namespaces = array('Drupal\edit\Annotation' => $namespaces['Drupal\edit']); - $this->discovery = new AnnotatedClassDiscovery('Plugin/InPlaceEditor', $namespaces, $annotation_namespaces, 'Drupal\edit\Annotation\InPlaceEditor'); + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\InPlaceEditor', 'Drupal\edit\Annotation\InPlaceEditor'); + $this->discovery->addAnnotationNamespace('Drupal\edit\Annotation'); $this->discovery = new AlterDecorator($this->discovery, 'edit_editor'); $this->discovery = new CacheDecorator($this->discovery, 'edit:editor'); $this->factory = new DefaultFactory($this->discovery); diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php b/core/modules/edit/src/Tests/EditLoadingTest.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php rename to core/modules/edit/src/Tests/EditLoadingTest.php diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php b/core/modules/edit/src/Tests/EditTestBase.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php rename to core/modules/edit/src/Tests/EditTestBase.php diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php b/core/modules/edit/src/Tests/EditorSelectionTest.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php rename to core/modules/edit/src/Tests/EditorSelectionTest.php diff --git a/core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php b/core/modules/edit/src/Tests/MetadataGeneratorTest.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php rename to core/modules/edit/src/Tests/MetadataGeneratorTest.php diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php b/core/modules/edit/src/Tests/edit/Access/EditEntityAccessCheckTest.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php rename to core/modules/edit/src/Tests/edit/Access/EditEntityAccessCheckTest.php diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/src/Tests/edit/Access/EditEntityFieldAccessCheckTest.php similarity index 100% rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php rename to core/modules/edit/src/Tests/edit/Access/EditEntityFieldAccessCheckTest.php diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php b/core/modules/edit/tests/modules/src/MockEditEntityFieldAccessCheck.php similarity index 100% rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php rename to core/modules/edit/tests/modules/src/MockEditEntityFieldAccessCheck.php diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/edit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php similarity index 100% rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php rename to core/modules/edit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php diff --git a/core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php b/core/modules/editor/src/Ajax/EditorDialogSave.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php rename to core/modules/editor/src/Ajax/EditorDialogSave.php diff --git a/core/modules/editor/lib/Drupal/editor/Ajax/GetUntransformedTextCommand.php b/core/modules/editor/src/Ajax/GetUntransformedTextCommand.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Ajax/GetUntransformedTextCommand.php rename to core/modules/editor/src/Ajax/GetUntransformedTextCommand.php diff --git a/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php b/core/modules/editor/src/Annotation/Editor.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Annotation/Editor.php rename to core/modules/editor/src/Annotation/Editor.php diff --git a/core/modules/editor/lib/Drupal/editor/EditorController.php b/core/modules/editor/src/EditorController.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/EditorController.php rename to core/modules/editor/src/EditorController.php diff --git a/core/modules/editor/lib/Drupal/editor/EditorInterface.php b/core/modules/editor/src/EditorInterface.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/EditorInterface.php rename to core/modules/editor/src/EditorInterface.php diff --git a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Entity/Editor.php rename to core/modules/editor/src/Entity/Editor.php diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php rename to core/modules/editor/src/Form/EditorImageDialog.php diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php b/core/modules/editor/src/Form/EditorLinkDialog.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php rename to core/modules/editor/src/Form/EditorLinkDialog.php diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/src/Plugin/EditorBase.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php rename to core/modules/editor/src/Plugin/EditorBase.php diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php b/core/modules/editor/src/Plugin/EditorManager.php similarity index 93% rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php rename to core/modules/editor/src/Plugin/EditorManager.php index 9adf267..61aca81 100644 --- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php +++ b/core/modules/editor/src/Plugin/EditorManager.php @@ -31,8 +31,8 @@ class EditorManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\editor\Annotation' => $namespaces['Drupal\editor']); - parent::__construct('Plugin/Editor', $namespaces, $annotation_namespaces, 'Drupal\editor\Annotation\Editor'); + parent::__construct($namespaces, 'Plugin\Editor', 'Drupal\editor\Annotation\Editor'); + $this->addAnnotationNamespace('Drupal\editor\Annotation'); $this->alterInfo($module_handler, 'editor_info'); $this->setCacheBackend($cache_backend, $language_manager, 'editor'); } diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php b/core/modules/editor/src/Plugin/EditorPluginInterface.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php rename to core/modules/editor/src/Plugin/EditorPluginInterface.php diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php rename to core/modules/editor/src/Plugin/InPlaceEditor/Editor.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationLoadingTest.php b/core/modules/editor/src/Tests/EditIntegrationLoadingTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationLoadingTest.php rename to core/modules/editor/src/Tests/EditIntegrationLoadingTest.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php b/core/modules/editor/src/Tests/EditIntegrationTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php rename to core/modules/editor/src/Tests/EditIntegrationTest.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php b/core/modules/editor/src/Tests/EditorAdminTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php rename to core/modules/editor/src/Tests/EditorAdminTest.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php b/core/modules/editor/src/Tests/EditorFileUsageTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php rename to core/modules/editor/src/Tests/EditorFileUsageTest.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php rename to core/modules/editor/src/Tests/EditorLoadingTest.php diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php b/core/modules/editor/src/Tests/EditorManagerTest.php similarity index 100% rename from core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php rename to core/modules/editor/src/Tests/EditorManagerTest.php diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php similarity index 100% rename from core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php rename to core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/field_type/ConfigurableEmailItem.php b/core/modules/email/src/Plugin/field/field_type/ConfigurableEmailItem.php similarity index 100% rename from core/modules/email/lib/Drupal/email/Plugin/field/field_type/ConfigurableEmailItem.php rename to core/modules/email/src/Plugin/field/field_type/ConfigurableEmailItem.php diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php b/core/modules/email/src/Plugin/field/formatter/MailToFormatter.php similarity index 100% rename from core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php rename to core/modules/email/src/Plugin/field/formatter/MailToFormatter.php diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php b/core/modules/email/src/Plugin/field/widget/EmailDefaultWidget.php similarity index 100% rename from core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php rename to core/modules/email/src/Plugin/field/widget/EmailDefaultWidget.php diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/email/src/Tests/EmailFieldTest.php similarity index 100% rename from core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php rename to core/modules/email/src/Tests/EmailFieldTest.php diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php b/core/modules/email/src/Tests/EmailItemTest.php similarity index 100% rename from core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php rename to core/modules/email/src/Tests/EmailItemTest.php diff --git a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php b/core/modules/entity/src/Controller/EntityDisplayModeController.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php rename to core/modules/entity/src/Controller/EntityDisplayModeController.php diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php b/core/modules/entity/src/Entity/EntityDisplay.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php rename to core/modules/entity/src/Entity/EntityDisplay.php diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/src/Entity/EntityFormDisplay.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php rename to core/modules/entity/src/Entity/EntityFormDisplay.php diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/src/Entity/EntityFormMode.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php rename to core/modules/entity/src/Entity/EntityFormMode.php diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/src/Entity/EntityViewMode.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php rename to core/modules/entity/src/Entity/EntityViewMode.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php b/core/modules/entity/src/EntityDisplayBase.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php rename to core/modules/entity/src/EntityDisplayBase.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php b/core/modules/entity/src/EntityDisplayBaseInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php rename to core/modules/entity/src/EntityDisplayBaseInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php b/core/modules/entity/src/EntityDisplayInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php rename to core/modules/entity/src/EntityDisplayInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeAccessController.php b/core/modules/entity/src/EntityDisplayModeAccessController.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeAccessController.php rename to core/modules/entity/src/EntityDisplayModeAccessController.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php b/core/modules/entity/src/EntityDisplayModeBase.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php rename to core/modules/entity/src/EntityDisplayModeBase.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeInterface.php b/core/modules/entity/src/EntityDisplayModeInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeInterface.php rename to core/modules/entity/src/EntityDisplayModeInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php b/core/modules/entity/src/EntityDisplayModeListController.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php rename to core/modules/entity/src/EntityDisplayModeListController.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorageController.php b/core/modules/entity/src/EntityDisplayModeStorageController.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorageController.php rename to core/modules/entity/src/EntityDisplayModeStorageController.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormDisplayInterface.php b/core/modules/entity/src/EntityFormDisplayInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityFormDisplayInterface.php rename to core/modules/entity/src/EntityFormDisplayInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormModeInterface.php b/core/modules/entity/src/EntityFormModeInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityFormModeInterface.php rename to core/modules/entity/src/EntityFormModeInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormModeListController.php b/core/modules/entity/src/EntityFormModeListController.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityFormModeListController.php rename to core/modules/entity/src/EntityFormModeListController.php diff --git a/core/modules/entity/lib/Drupal/entity/EntityViewModeInterface.php b/core/modules/entity/src/EntityViewModeInterface.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/EntityViewModeInterface.php rename to core/modules/entity/src/EntityViewModeInterface.php diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeAddForm.php b/core/modules/entity/src/Form/EntityDisplayModeAddForm.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeAddForm.php rename to core/modules/entity/src/Form/EntityDisplayModeAddForm.php diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php b/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php rename to core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php b/core/modules/entity/src/Form/EntityDisplayModeEditForm.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php rename to core/modules/entity/src/Form/EntityDisplayModeEditForm.php diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php b/core/modules/entity/src/Form/EntityDisplayModeFormBase.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php rename to core/modules/entity/src/Form/EntityDisplayModeFormBase.php diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityFormModeAddForm.php b/core/modules/entity/src/Form/EntityFormModeAddForm.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Form/EntityFormModeAddForm.php rename to core/modules/entity/src/Form/EntityFormModeAddForm.php diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php b/core/modules/entity/src/Tests/EntityDisplayModeTest.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php rename to core/modules/entity/src/Tests/EntityDisplayModeTest.php diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/src/Tests/EntityDisplayTest.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php rename to core/modules/entity/src/Tests/EntityDisplayTest.php diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php b/core/modules/entity/src/Tests/EntityFormDisplayTest.php similarity index 100% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php rename to core/modules/entity/src/Tests/EntityFormDisplayTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Annotation/EntityReferenceSelection.php b/core/modules/entity_reference/src/Annotation/EntityReferenceSelection.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Annotation/EntityReferenceSelection.php rename to core/modules/entity_reference/src/Annotation/EntityReferenceSelection.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php b/core/modules/entity_reference/src/EntityReferenceAutocomplete.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php rename to core/modules/entity_reference/src/EntityReferenceAutocomplete.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php b/core/modules/entity_reference/src/EntityReferenceController.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php rename to core/modules/entity_reference/src/EntityReferenceController.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php b/core/modules/entity_reference/src/Plugin/Derivative/SelectionBase.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php rename to core/modules/entity_reference/src/Plugin/Derivative/SelectionBase.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionBroken.php b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionBroken.php rename to core/modules/entity_reference/src/Plugin/Type/Selection/SelectionBroken.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionInterface.php b/core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionInterface.php rename to core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/SelectionPluginManager.php b/core/modules/entity_reference/src/Plugin/Type/SelectionPluginManager.php similarity index 92% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/SelectionPluginManager.php rename to core/modules/entity_reference/src/Plugin/Type/SelectionPluginManager.php index 11582f2..70e90f0 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/SelectionPluginManager.php +++ b/core/modules/entity_reference/src/Plugin/Type/SelectionPluginManager.php @@ -27,8 +27,8 @@ class SelectionPluginManager extends DefaultPluginManager { * {@inheritdoc} */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\entity_reference\Annotation' => $namespaces['Drupal\entity_reference']); - $this->discovery = new AnnotatedClassDiscovery('Plugin/entity_reference/selection', $namespaces, $annotation_namespaces, 'Drupal\entity_reference\Annotation\EntityReferenceSelection'); + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\entity_reference\selection', 'Drupal\entity_reference\Annotation\EntityReferenceSelection'); + $this->discovery->addAnnotationNamespace('Drupal\entity_reference\Annotation'); // We're not using the parent constructor because we use a different factory // method and don't need the derivative discovery decorator. diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php b/core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php rename to core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/Plugin/field/field_type/ConfigurableEntityReferenceItem.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php rename to core/modules/entity_reference/src/Plugin/field/field_type/ConfigurableEntityReferenceItem.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php b/core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceEntityFormatter.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php rename to core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceEntityFormatter.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceFormatterBase.php b/core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceFormatterBase.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceFormatterBase.php rename to core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceFormatterBase.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php b/core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceIdFormatter.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php rename to core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceIdFormatter.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php b/core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceLabelFormatter.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php rename to core/modules/entity_reference/src/Plugin/field/formatter/EntityReferenceLabelFormatter.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteTagsWidget.php b/core/modules/entity_reference/src/Plugin/field/widget/AutocompleteTagsWidget.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteTagsWidget.php rename to core/modules/entity_reference/src/Plugin/field/widget/AutocompleteTagsWidget.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidget.php b/core/modules/entity_reference/src/Plugin/field/widget/AutocompleteWidget.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidget.php rename to core/modules/entity_reference/src/Plugin/field/widget/AutocompleteWidget.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php b/core/modules/entity_reference/src/Plugin/field/widget/AutocompleteWidgetBase.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php rename to core/modules/entity_reference/src/Plugin/field/widget/AutocompleteWidgetBase.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php rename to core/modules/entity_reference/src/Plugin/views/display/EntityReference.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php rename to core/modules/entity_reference/src/Plugin/views/row/EntityReference.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php rename to core/modules/entity_reference/src/Plugin/views/style/EntityReference.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/RecursiveRenderingException.php b/core/modules/entity_reference/src/RecursiveRenderingException.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/RecursiveRenderingException.php rename to core/modules/entity_reference/src/RecursiveRenderingException.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAutocompleteTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceAutocompleteTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceFieldTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceFieldTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceFieldTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceItemTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceItemTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceItemTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceItemTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceSelectionAccessTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php rename to core/modules/entity_reference/src/Tests/EntityReferenceSelectionSortTest.php diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php b/core/modules/entity_reference/src/Tests/Views/SelectionTest.php similarity index 100% rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php rename to core/modules/entity_reference/src/Tests/Views/SelectionTest.php diff --git a/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php b/core/modules/field/src/Annotation/FieldFormatter.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php rename to core/modules/field/src/Annotation/FieldFormatter.php diff --git a/core/modules/field/lib/Drupal/field/Annotation/FieldWidget.php b/core/modules/field/src/Annotation/FieldWidget.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Annotation/FieldWidget.php rename to core/modules/field/src/Annotation/FieldWidget.php diff --git a/core/modules/field/lib/Drupal/field/Entity/Field.php b/core/modules/field/src/Entity/Field.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Entity/Field.php rename to core/modules/field/src/Entity/Field.php diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php b/core/modules/field/src/Entity/FieldInstance.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Entity/FieldInstance.php rename to core/modules/field/src/Entity/FieldInstance.php diff --git a/core/modules/field/lib/Drupal/field/Field.php b/core/modules/field/src/Field.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Field.php rename to core/modules/field/src/Field.php diff --git a/core/modules/field/lib/Drupal/field/FieldException.php b/core/modules/field/src/FieldException.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldException.php rename to core/modules/field/src/FieldException.php diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/src/FieldInfo.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldInfo.php rename to core/modules/field/src/FieldInfo.php diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceInterface.php b/core/modules/field/src/FieldInstanceInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldInstanceInterface.php rename to core/modules/field/src/FieldInstanceInterface.php diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/src/FieldInstanceStorageController.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php rename to core/modules/field/src/FieldInstanceStorageController.php diff --git a/core/modules/field/lib/Drupal/field/FieldInterface.php b/core/modules/field/src/FieldInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldInterface.php rename to core/modules/field/src/FieldInterface.php diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/src/FieldStorageController.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldStorageController.php rename to core/modules/field/src/FieldStorageController.php diff --git a/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php b/core/modules/field/src/FieldUpdateForbiddenException.php similarity index 100% rename from core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php rename to core/modules/field/src/FieldUpdateForbiddenException.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/PluginSettingsBase.php b/core/modules/field/src/Plugin/PluginSettingsBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/PluginSettingsBase.php rename to core/modules/field/src/Plugin/PluginSettingsBase.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/PluginSettingsInterface.php b/core/modules/field/src/Plugin/PluginSettingsInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/PluginSettingsInterface.php rename to core/modules/field/src/Plugin/PluginSettingsInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/src/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php rename to core/modules/field/src/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php b/core/modules/field/src/Plugin/Type/FieldType/ConfigField.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php rename to core/modules/field/src/Plugin/Type/FieldType/ConfigField.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php b/core/modules/field/src/Plugin/Type/FieldType/ConfigFieldInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php rename to core/modules/field/src/Plugin/Type/FieldType/ConfigFieldInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php b/core/modules/field/src/Plugin/Type/FieldType/ConfigFieldItemBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php rename to core/modules/field/src/Plugin/Type/FieldType/ConfigFieldItemBase.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemInterface.php b/core/modules/field/src/Plugin/Type/FieldType/ConfigFieldItemInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemInterface.php rename to core/modules/field/src/Plugin/Type/FieldType/ConfigFieldItemInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php b/core/modules/field/src/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php rename to core/modules/field/src/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php b/core/modules/field/src/Plugin/Type/Formatter/FormatterBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php rename to core/modules/field/src/Plugin/Type/Formatter/FormatterBase.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterInterface.php b/core/modules/field/src/Plugin/Type/Formatter/FormatterInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterInterface.php rename to core/modules/field/src/Plugin/Type/Formatter/FormatterInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php b/core/modules/field/src/Plugin/Type/Formatter/FormatterPluginManager.php similarity index 97% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php rename to core/modules/field/src/Plugin/Type/Formatter/FormatterPluginManager.php index c916a9f..f8b2df1 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php +++ b/core/modules/field/src/Plugin/Type/Formatter/FormatterPluginManager.php @@ -54,9 +54,9 @@ class FormatterPluginManager extends DefaultPluginManager { * The 'field type' plugin manager. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LanguageManager $language_manager, FieldTypePluginManager $field_type_manager) { - $annotation_namespaces = array('Drupal\field\Annotation' => $namespaces['Drupal\field']); - parent::__construct('Plugin/field/formatter', $namespaces, $annotation_namespaces, 'Drupal\field\Annotation\FieldFormatter'); + parent::__construct($namespaces, 'Plugin\field\formatter', 'Drupal\field\Annotation\FieldFormatter'); + $this->addAnnotationNamespace('Drupal\field\Annotation'); $this->setCacheBackend($cache_backend, $language_manager, 'field_formatter_types'); $this->alterInfo($module_handler, 'field_formatter_info'); diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php b/core/modules/field/src/Plugin/Type/Widget/WidgetBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php rename to core/modules/field/src/Plugin/Type/Widget/WidgetBase.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBaseInterface.php b/core/modules/field/src/Plugin/Type/Widget/WidgetBaseInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBaseInterface.php rename to core/modules/field/src/Plugin/Type/Widget/WidgetBaseInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetFactory.php b/core/modules/field/src/Plugin/Type/Widget/WidgetFactory.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetFactory.php rename to core/modules/field/src/Plugin/Type/Widget/WidgetFactory.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php b/core/modules/field/src/Plugin/Type/Widget/WidgetInterface.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php rename to core/modules/field/src/Plugin/Type/Widget/WidgetInterface.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php b/core/modules/field/src/Plugin/Type/Widget/WidgetPluginManager.php similarity index 97% rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php rename to core/modules/field/src/Plugin/Type/Widget/WidgetPluginManager.php index 0fe4be9..e7dac34 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php +++ b/core/modules/field/src/Plugin/Type/Widget/WidgetPluginManager.php @@ -54,9 +54,9 @@ class WidgetPluginManager extends DefaultPluginManager { * The 'field type' plugin manager. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LanguageManager $language_manager, FieldTypePluginManager $field_type_manager) { - $annotation_namespaces = array('Drupal\field\Annotation' => $namespaces['Drupal\field']); - parent::__construct('Plugin/field/widget', $namespaces, $annotation_namespaces, 'Drupal\field\Annotation\FieldWidget'); + parent::__construct($namespaces, 'Plugin\field\widget', 'Drupal\field\Annotation\FieldWidget'); + $this->addAnnotationNamespace('Drupal\field\Annotation'); $this->setCacheBackend($cache_backend, $language_manager, 'field_widget_types'); $this->alterInfo($module_handler, 'field_widget_info'); diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php b/core/modules/field/src/Plugin/field/field_type/LegacyConfigField.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php rename to core/modules/field/src/Plugin/field/field_type/LegacyConfigField.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php b/core/modules/field/src/Plugin/field/field_type/LegacyConfigFieldItem.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php rename to core/modules/field/src/Plugin/field/field_type/LegacyConfigFieldItem.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/widget/HiddenWidget.php b/core/modules/field/src/Plugin/field/widget/HiddenWidget.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/field/widget/HiddenWidget.php rename to core/modules/field/src/Plugin/field/widget/HiddenWidget.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php b/core/modules/field/src/Plugin/views/argument/FieldList.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php rename to core/modules/field/src/Plugin/views/argument/FieldList.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php b/core/modules/field/src/Plugin/views/argument/ListString.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php rename to core/modules/field/src/Plugin/views/argument/ListString.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/src/Plugin/views/field/Field.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php rename to core/modules/field/src/Plugin/views/field/Field.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/src/Plugin/views/filter/FieldList.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php rename to core/modules/field/src/Plugin/views/filter/FieldList.php diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/src/Plugin/views/relationship/EntityReverse.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php rename to core/modules/field/src/Plugin/views/relationship/EntityReverse.php diff --git a/core/modules/field/lib/Drupal/field/Tests/ActiveTest.php b/core/modules/field/src/Tests/ActiveTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/ActiveTest.php rename to core/modules/field/src/Tests/ActiveTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/src/Tests/BulkDeleteTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php rename to core/modules/field/src/Tests/BulkDeleteTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php b/core/modules/field/src/Tests/CrudTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/CrudTest.php rename to core/modules/field/src/Tests/CrudTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php rename to core/modules/field/src/Tests/DisplayApiTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php b/core/modules/field/src/Tests/FieldAccessTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php rename to core/modules/field/src/Tests/FieldAccessTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php rename to core/modules/field/src/Tests/FieldAttachOtherTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php b/core/modules/field/src/Tests/FieldAttachStorageTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php rename to core/modules/field/src/Tests/FieldAttachStorageTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportChangeTest.php b/core/modules/field/src/Tests/FieldImportChangeTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldImportChangeTest.php rename to core/modules/field/src/Tests/FieldImportChangeTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php b/core/modules/field/src/Tests/FieldImportCreateTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php rename to core/modules/field/src/Tests/FieldImportCreateTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php b/core/modules/field/src/Tests/FieldImportDeleteTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php rename to core/modules/field/src/Tests/FieldImportDeleteTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php b/core/modules/field/src/Tests/FieldInfoTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php rename to core/modules/field/src/Tests/FieldInfoTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/src/Tests/FieldInstanceCrudTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php rename to core/modules/field/src/Tests/FieldInstanceCrudTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldTestBase.php b/core/modules/field/src/Tests/FieldTestBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldTestBase.php rename to core/modules/field/src/Tests/FieldTestBase.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php rename to core/modules/field/src/Tests/FieldUnitTestBase.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldValidationTest.php b/core/modules/field/src/Tests/FieldValidationTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FieldValidationTest.php rename to core/modules/field/src/Tests/FieldValidationTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/FormTest.php rename to core/modules/field/src/Tests/FormTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php b/core/modules/field/src/Tests/NestedFormTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php rename to core/modules/field/src/Tests/NestedFormTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php b/core/modules/field/src/Tests/ShapeItemTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php rename to core/modules/field/src/Tests/ShapeItemTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php b/core/modules/field/src/Tests/TestItemTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/TestItemTest.php rename to core/modules/field/src/Tests/TestItemTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/src/Tests/TranslationTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/TranslationTest.php rename to core/modules/field/src/Tests/TranslationTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/src/Tests/TranslationWebTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php rename to core/modules/field/src/Tests/TranslationWebTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php b/core/modules/field/src/Tests/Views/ApiDataTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php rename to core/modules/field/src/Tests/Views/ApiDataTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php b/core/modules/field/src/Tests/Views/FieldTestBase.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php rename to core/modules/field/src/Tests/Views/FieldTestBase.php diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php b/core/modules/field/src/Tests/Views/FieldUITest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php rename to core/modules/field/src/Tests/Views/FieldUITest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php rename to core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php diff --git a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php similarity index 100% rename from core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php rename to core/modules/field/src/Tests/reEnableModuleFieldTest.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldDefaultFormatter.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldDefaultFormatter.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldEmptyFormatter.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldEmptyFormatter.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldMultipleFormatter.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldMultipleFormatter.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldPrepareViewFormatter.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/formatter/TestFieldPrepareViewFormatter.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/widget/TestFieldWidget.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/widget/TestFieldWidget.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/src/Plugin/field/widget/TestFieldWidgetMultiple.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php rename to core/modules/field/tests/modules/field_test/src/Plugin/field/widget/TestFieldWidgetMultiple.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/HiddenTestItem.php b/core/modules/field/tests/modules/field_test/src/Type/HiddenTestItem.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/HiddenTestItem.php rename to core/modules/field/tests/modules/field_test/src/Type/HiddenTestItem.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/ShapeItem.php b/core/modules/field/tests/modules/field_test/src/Type/ShapeItem.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/ShapeItem.php rename to core/modules/field/tests/modules/field_test/src/Type/ShapeItem.php diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/TestItem.php b/core/modules/field/tests/modules/field_test/src/Type/TestItem.php similarity index 100% rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/TestItem.php rename to core/modules/field/tests/modules/field_test/src/Type/TestItem.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php b/core/modules/field_ui/src/Access/FormModeAccessCheck.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php rename to core/modules/field_ui/src/Access/FormModeAccessCheck.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php b/core/modules/field_ui/src/Access/ViewModeAccessCheck.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php rename to core/modules/field_ui/src/Access/ViewModeAccessCheck.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/src/DisplayOverview.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php rename to core/modules/field_ui/src/DisplayOverview.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php b/core/modules/field_ui/src/DisplayOverviewBase.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php rename to core/modules/field_ui/src/DisplayOverviewBase.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php b/core/modules/field_ui/src/FieldListController.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php rename to core/modules/field_ui/src/FieldListController.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/src/FieldOverview.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php rename to core/modules/field_ui/src/FieldOverview.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldUI.php b/core/modules/field_ui/src/FieldUI.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/FieldUI.php rename to core/modules/field_ui/src/FieldUI.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php b/core/modules/field_ui/src/Form/FieldDeleteForm.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php rename to core/modules/field_ui/src/Form/FieldDeleteForm.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/src/Form/FieldEditForm.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php rename to core/modules/field_ui/src/Form/FieldEditForm.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/src/Form/FieldInstanceEditForm.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php rename to core/modules/field_ui/src/Form/FieldInstanceEditForm.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/src/FormDisplayOverview.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php rename to core/modules/field_ui/src/FormDisplayOverview.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/src/OverviewBase.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php rename to core/modules/field_ui/src/OverviewBase.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php b/core/modules/field_ui/src/Routing/RouteSubscriber.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php rename to core/modules/field_ui/src/Routing/RouteSubscriber.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php b/core/modules/field_ui/src/Tests/FieldUIRouteTest.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php rename to core/modules/field_ui/src/Tests/FieldUIRouteTest.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/src/Tests/FieldUiTestBase.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php rename to core/modules/field_ui/src/Tests/FieldUiTestBase.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php rename to core/modules/field_ui/src/Tests/ManageDisplayTest.php diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php similarity index 100% rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php rename to core/modules/field_ui/src/Tests/ManageFieldsTest.php diff --git a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php b/core/modules/field_ui/tests/modules/field_ui_test/src/Entity/FieldUITestNoBundle.php similarity index 100% rename from core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php rename to core/modules/field_ui/tests/modules/field_ui_test/src/Entity/FieldUITestNoBundle.php diff --git a/core/modules/file/lib/Drupal/file/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Controller/FileWidgetAjaxController.php rename to core/modules/file/src/Controller/FileWidgetAjaxController.php diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/src/Entity/File.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Entity/File.php rename to core/modules/file/src/Entity/File.php diff --git a/core/modules/file/lib/Drupal/file/FileInterface.php b/core/modules/file/src/FileInterface.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileInterface.php rename to core/modules/file/src/FileInterface.php diff --git a/core/modules/file/lib/Drupal/file/FileStorageController.php b/core/modules/file/src/FileStorageController.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileStorageController.php rename to core/modules/file/src/FileStorageController.php diff --git a/core/modules/file/lib/Drupal/file/FileStorageControllerInterface.php b/core/modules/file/src/FileStorageControllerInterface.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileStorageControllerInterface.php rename to core/modules/file/src/FileStorageControllerInterface.php diff --git a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php rename to core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php b/core/modules/file/src/FileUsage/FileUsageBase.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php rename to core/modules/file/src/FileUsage/FileUsageBase.php diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php b/core/modules/file/src/FileUsage/FileUsageInterface.php similarity index 100% rename from core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php rename to core/modules/file/src/FileUsage/FileUsageInterface.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php b/core/modules/file/src/Plugin/entity_reference/selection/FileSelection.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php rename to core/modules/file/src/Plugin/entity_reference/selection/FileSelection.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/FileFormatterBase.php b/core/modules/file/src/Plugin/field/formatter/FileFormatterBase.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/FileFormatterBase.php rename to core/modules/file/src/Plugin/field/formatter/FileFormatterBase.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php b/core/modules/file/src/Plugin/field/formatter/GenericFileFormatter.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php rename to core/modules/file/src/Plugin/field/formatter/GenericFileFormatter.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php b/core/modules/file/src/Plugin/field/formatter/RSSEnclosureFormatter.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php rename to core/modules/file/src/Plugin/field/formatter/RSSEnclosureFormatter.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php b/core/modules/file/src/Plugin/field/formatter/TableFormatter.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php rename to core/modules/file/src/Plugin/field/formatter/TableFormatter.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php b/core/modules/file/src/Plugin/field/formatter/UrlPlainFormatter.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php rename to core/modules/file/src/Plugin/field/formatter/UrlPlainFormatter.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php b/core/modules/file/src/Plugin/field/widget/FileWidget.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php rename to core/modules/file/src/Plugin/field/widget/FileWidget.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/src/Plugin/views/argument/Fid.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php rename to core/modules/file/src/Plugin/views/argument/Fid.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/src/Plugin/views/field/Extension.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php rename to core/modules/file/src/Plugin/views/field/Extension.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/src/Plugin/views/field/File.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/field/File.php rename to core/modules/file/src/Plugin/views/field/File.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/src/Plugin/views/field/FileMime.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php rename to core/modules/file/src/Plugin/views/field/FileMime.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/src/Plugin/views/field/Status.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php rename to core/modules/file/src/Plugin/views/field/Status.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/src/Plugin/views/field/Uri.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php rename to core/modules/file/src/Plugin/views/field/Uri.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/src/Plugin/views/filter/Status.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php rename to core/modules/file/src/Plugin/views/filter/Status.php diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php b/core/modules/file/src/Plugin/views/wizard/File.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php rename to core/modules/file/src/Plugin/views/wizard/File.php diff --git a/core/modules/file/lib/Drupal/file/Tests/CopyTest.php b/core/modules/file/src/Tests/CopyTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/CopyTest.php rename to core/modules/file/src/Tests/CopyTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/DeleteTest.php b/core/modules/file/src/Tests/DeleteTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/DeleteTest.php rename to core/modules/file/src/Tests/DeleteTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/DownloadTest.php rename to core/modules/file/src/Tests/DownloadTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php rename to core/modules/file/src/Tests/FileFieldDisplayTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldPathTest.php b/core/modules/file/src/Tests/FileFieldPathTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldPathTest.php rename to core/modules/file/src/Tests/FileFieldPathTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php rename to core/modules/file/src/Tests/FileFieldRSSContentTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php b/core/modules/file/src/Tests/FileFieldRevisionTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php rename to core/modules/file/src/Tests/FileFieldRevisionTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php rename to core/modules/file/src/Tests/FileFieldTestBase.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php b/core/modules/file/src/Tests/FileFieldValidateTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php rename to core/modules/file/src/Tests/FileFieldValidateTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php rename to core/modules/file/src/Tests/FileFieldWidgetTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php b/core/modules/file/src/Tests/FileItemTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileItemTest.php rename to core/modules/file/src/Tests/FileItemTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileListingTest.php rename to core/modules/file/src/Tests/FileListingTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileManagedFileElementTest.php b/core/modules/file/src/Tests/FileManagedFileElementTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileManagedFileElementTest.php rename to core/modules/file/src/Tests/FileManagedFileElementTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileManagedTestBase.php b/core/modules/file/src/Tests/FileManagedTestBase.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileManagedTestBase.php rename to core/modules/file/src/Tests/FileManagedTestBase.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php b/core/modules/file/src/Tests/FilePrivateTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php rename to core/modules/file/src/Tests/FilePrivateTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php rename to core/modules/file/src/Tests/FileTokenReplaceTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/LoadTest.php b/core/modules/file/src/Tests/LoadTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/LoadTest.php rename to core/modules/file/src/Tests/LoadTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/MoveTest.php b/core/modules/file/src/Tests/MoveTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/MoveTest.php rename to core/modules/file/src/Tests/MoveTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/RemoteFileSaveUploadTest.php b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/RemoteFileSaveUploadTest.php rename to core/modules/file/src/Tests/RemoteFileSaveUploadTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveDataTest.php b/core/modules/file/src/Tests/SaveDataTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/SaveDataTest.php rename to core/modules/file/src/Tests/SaveDataTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/SaveTest.php rename to core/modules/file/src/Tests/SaveTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/SaveUploadTest.php rename to core/modules/file/src/Tests/SaveUploadTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php b/core/modules/file/src/Tests/SpaceUsedTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php rename to core/modules/file/src/Tests/SpaceUsedTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/UsageTest.php b/core/modules/file/src/Tests/UsageTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/UsageTest.php rename to core/modules/file/src/Tests/UsageTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/ValidateTest.php b/core/modules/file/src/Tests/ValidateTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/ValidateTest.php rename to core/modules/file/src/Tests/ValidateTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php b/core/modules/file/src/Tests/ValidatorTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php rename to core/modules/file/src/Tests/ValidatorTest.php diff --git a/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php rename to core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php diff --git a/core/modules/file/lib/Drupal/file/Type/FileField.php b/core/modules/file/src/Type/FileField.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Type/FileField.php rename to core/modules/file/src/Type/FileField.php diff --git a/core/modules/file/lib/Drupal/file/Type/FileItem.php b/core/modules/file/src/Type/FileItem.php similarity index 100% rename from core/modules/file/lib/Drupal/file/Type/FileItem.php rename to core/modules/file/src/Type/FileItem.php diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyReadOnlyStreamWrapper.php b/core/modules/file/tests/file_test/src/DummyReadOnlyStreamWrapper.php similarity index 100% rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyReadOnlyStreamWrapper.php rename to core/modules/file/tests/file_test/src/DummyReadOnlyStreamWrapper.php diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyRemoteStreamWrapper.php b/core/modules/file/tests/file_test/src/DummyRemoteStreamWrapper.php similarity index 100% rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyRemoteStreamWrapper.php rename to core/modules/file/tests/file_test/src/DummyRemoteStreamWrapper.php diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyStreamWrapper.php b/core/modules/file/tests/file_test/src/DummyStreamWrapper.php similarity index 100% rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyStreamWrapper.php rename to core/modules/file/tests/file_test/src/DummyStreamWrapper.php diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/Form/FileTestForm.php b/core/modules/file/tests/file_test/src/Form/FileTestForm.php similarity index 100% rename from core/modules/file/tests/file_test/lib/Drupal/file_test/Form/FileTestForm.php rename to core/modules/file/tests/file_test/src/Form/FileTestForm.php diff --git a/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php b/core/modules/filter/src/Access/FormatDisableCheck.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php rename to core/modules/filter/src/Access/FormatDisableCheck.php diff --git a/core/modules/filter/lib/Drupal/filter/Annotation/Filter.php b/core/modules/filter/src/Annotation/Filter.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Annotation/Filter.php rename to core/modules/filter/src/Annotation/Filter.php diff --git a/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php b/core/modules/filter/src/Controller/FilterController.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Controller/FilterController.php rename to core/modules/filter/src/Controller/FilterController.php diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php rename to core/modules/filter/src/Entity/FilterFormat.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterBag.php b/core/modules/filter/src/FilterBag.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterBag.php rename to core/modules/filter/src/FilterBag.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php b/core/modules/filter/src/FilterFormatAccessController.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php rename to core/modules/filter/src/FilterFormatAccessController.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatAddFormController.php b/core/modules/filter/src/FilterFormatAddFormController.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatAddFormController.php rename to core/modules/filter/src/FilterFormatAddFormController.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatEditFormController.php b/core/modules/filter/src/FilterFormatEditFormController.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatEditFormController.php rename to core/modules/filter/src/FilterFormatEditFormController.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php b/core/modules/filter/src/FilterFormatFormControllerBase.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php rename to core/modules/filter/src/FilterFormatFormControllerBase.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php b/core/modules/filter/src/FilterFormatInterface.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php rename to core/modules/filter/src/FilterFormatInterface.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php b/core/modules/filter/src/FilterFormatListController.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/FilterFormatListController.php rename to core/modules/filter/src/FilterFormatListController.php diff --git a/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php b/core/modules/filter/src/FilterPluginManager.php similarity index 90% rename from core/modules/filter/lib/Drupal/filter/FilterPluginManager.php rename to core/modules/filter/src/FilterPluginManager.php index e2aae54..6892c75 100644 --- a/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php +++ b/core/modules/filter/src/FilterPluginManager.php @@ -39,8 +39,8 @@ class FilterPluginManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\filter\Annotation' => $namespaces['Drupal\filter']); - parent::__construct('Plugin/Filter', $namespaces, $annotation_namespaces, 'Drupal\filter\Annotation\Filter'); + parent::__construct($namespaces, 'Plugin\Filter', 'Drupal\filter\Annotation\Filter'); + $this->addAnnotationNamespace('Drupal\filter\Annotation'); $this->alterInfo($module_handler, 'filter_info'); $this->setCacheBackend($cache_backend, $language_manager, 'filter_plugins', array('filter_formats' => TRUE)); } diff --git a/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php b/core/modules/filter/src/Form/FilterDisableForm.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php rename to core/modules/filter/src/Form/FilterDisableForm.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php b/core/modules/filter/src/Plugin/DataType/FilterFormat.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php rename to core/modules/filter/src/Plugin/DataType/FilterFormat.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php b/core/modules/filter/src/Plugin/Filter/FilterAutoP.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php rename to core/modules/filter/src/Plugin/Filter/FilterAutoP.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php rename to core/modules/filter/src/Plugin/Filter/FilterCaption.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php rename to core/modules/filter/src/Plugin/Filter/FilterHtml.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php b/core/modules/filter/src/Plugin/Filter/FilterHtmlCorrector.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php rename to core/modules/filter/src/Plugin/Filter/FilterHtmlCorrector.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php b/core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php rename to core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php b/core/modules/filter/src/Plugin/Filter/FilterHtmlImageSecure.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php rename to core/modules/filter/src/Plugin/Filter/FilterHtmlImageSecure.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php b/core/modules/filter/src/Plugin/Filter/FilterNull.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php rename to core/modules/filter/src/Plugin/Filter/FilterNull.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php b/core/modules/filter/src/Plugin/Filter/FilterUrl.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php rename to core/modules/filter/src/Plugin/Filter/FilterUrl.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php rename to core/modules/filter/src/Plugin/FilterBase.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php b/core/modules/filter/src/Plugin/FilterInterface.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php rename to core/modules/filter/src/Plugin/FilterInterface.php diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php b/core/modules/filter/src/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php rename to core/modules/filter/src/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php rename to core/modules/filter/src/Tests/FilterAPITest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php rename to core/modules/filter/src/Tests/FilterAdminTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php b/core/modules/filter/src/Tests/FilterCrudTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php rename to core/modules/filter/src/Tests/FilterCrudTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php rename to core/modules/filter/src/Tests/FilterDefaultConfigTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php b/core/modules/filter/src/Tests/FilterDefaultFormatTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php rename to core/modules/filter/src/Tests/FilterDefaultFormatTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php b/core/modules/filter/src/Tests/FilterFormatAccessTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php rename to core/modules/filter/src/Tests/FilterFormatAccessTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php b/core/modules/filter/src/Tests/FilterHooksTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php rename to core/modules/filter/src/Tests/FilterHooksTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php rename to core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php b/core/modules/filter/src/Tests/FilterNoFormatTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php rename to core/modules/filter/src/Tests/FilterNoFormatTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php b/core/modules/filter/src/Tests/FilterSecurityTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php rename to core/modules/filter/src/Tests/FilterSecurityTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php b/core/modules/filter/src/Tests/FilterSettingsTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php rename to core/modules/filter/src/Tests/FilterSettingsTest.php diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php b/core/modules/filter/src/Tests/FilterUnitTest.php similarity index 100% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php rename to core/modules/filter/src/Tests/FilterUnitTest.php diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php similarity index 100% rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php similarity index 100% rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestUncacheable.php similarity index 100% rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestUncacheable.php diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/src/Controller/ForumController.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Controller/ForumController.php rename to core/modules/forum/src/Controller/ForumController.php diff --git a/core/modules/forum/lib/Drupal/forum/Form/ContainerFormController.php b/core/modules/forum/src/Form/ContainerFormController.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Form/ContainerFormController.php rename to core/modules/forum/src/Form/ContainerFormController.php diff --git a/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php b/core/modules/forum/src/Form/DeleteForm.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php rename to core/modules/forum/src/Form/DeleteForm.php diff --git a/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php b/core/modules/forum/src/Form/ForumFormController.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php rename to core/modules/forum/src/Form/ForumFormController.php diff --git a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php b/core/modules/forum/src/ForumBreadcrumbBuilder.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php rename to core/modules/forum/src/ForumBreadcrumbBuilder.php diff --git a/core/modules/forum/lib/Drupal/forum/ForumManager.php b/core/modules/forum/src/ForumManager.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/ForumManager.php rename to core/modules/forum/src/ForumManager.php diff --git a/core/modules/forum/lib/Drupal/forum/ForumManagerInterface.php b/core/modules/forum/src/ForumManagerInterface.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/ForumManagerInterface.php rename to core/modules/forum/src/ForumManagerInterface.php diff --git a/core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php b/core/modules/forum/src/ForumSettingsForm.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php rename to core/modules/forum/src/ForumSettingsForm.php diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php rename to core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php b/core/modules/forum/src/Plugin/Block/ForumBlockBase.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php rename to core/modules/forum/src/Plugin/Block/ForumBlockBase.php diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php rename to core/modules/forum/src/Plugin/Block/NewTopicsBlock.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php rename to core/modules/forum/src/Tests/ForumBlockTest.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php b/core/modules/forum/src/Tests/ForumIndexTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php rename to core/modules/forum/src/Tests/ForumIndexTest.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php b/core/modules/forum/src/Tests/ForumNodeAccessTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php rename to core/modules/forum/src/Tests/ForumNodeAccessTest.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php rename to core/modules/forum/src/Tests/ForumTest.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/ForumUninstallTest.php rename to core/modules/forum/src/Tests/ForumUninstallTest.php diff --git a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php b/core/modules/forum/src/Tests/Views/ForumIntegrationTest.php similarity index 100% rename from core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php rename to core/modules/forum/src/Tests/Views/ForumIntegrationTest.php diff --git a/core/modules/forum/tests/Drupal/forum/Tests/ForumManagerTest.php b/core/modules/forum/tests/src/ForumManagerTest.php similarity index 100% rename from core/modules/forum/tests/Drupal/forum/Tests/ForumManagerTest.php rename to core/modules/forum/tests/src/ForumManagerTest.php diff --git a/core/modules/hal/lib/Drupal/hal/Encoder/JsonEncoder.php b/core/modules/hal/src/Encoder/JsonEncoder.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Encoder/JsonEncoder.php rename to core/modules/hal/src/Encoder/JsonEncoder.php diff --git a/core/modules/hal/lib/Drupal/hal/HalSubscriber.php b/core/modules/hal/src/HalSubscriber.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/HalSubscriber.php rename to core/modules/hal/src/HalSubscriber.php diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php b/core/modules/hal/src/Normalizer/EntityNormalizer.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php rename to core/modules/hal/src/Normalizer/EntityNormalizer.php diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php rename to core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php b/core/modules/hal/src/Normalizer/FieldItemNormalizer.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php rename to core/modules/hal/src/Normalizer/FieldItemNormalizer.php diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php b/core/modules/hal/src/Normalizer/FieldNormalizer.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php rename to core/modules/hal/src/Normalizer/FieldNormalizer.php diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/NormalizerBase.php b/core/modules/hal/src/Normalizer/NormalizerBase.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Normalizer/NormalizerBase.php rename to core/modules/hal/src/Normalizer/NormalizerBase.php diff --git a/core/modules/hal/lib/Drupal/hal/Tests/DenormalizeTest.php b/core/modules/hal/src/Tests/DenormalizeTest.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Tests/DenormalizeTest.php rename to core/modules/hal/src/Tests/DenormalizeTest.php diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php b/core/modules/hal/src/Tests/NormalizeTest.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php rename to core/modules/hal/src/Tests/NormalizeTest.php diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/src/Tests/NormalizerTestBase.php similarity index 100% rename from core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php rename to core/modules/hal/src/Tests/NormalizerTestBase.php diff --git a/core/modules/help/lib/Drupal/help/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php similarity index 100% rename from core/modules/help/lib/Drupal/help/Controller/HelpController.php rename to core/modules/help/src/Controller/HelpController.php diff --git a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php similarity index 100% rename from core/modules/help/lib/Drupal/help/Tests/HelpTest.php rename to core/modules/help/src/Tests/HelpTest.php diff --git a/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php b/core/modules/help/src/Tests/NoHelpTest.php similarity index 100% rename from core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php rename to core/modules/help/src/Tests/NoHelpTest.php diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php similarity index 100% rename from core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php rename to core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php similarity index 100% rename from core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php rename to core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php diff --git a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php b/core/modules/history/src/Tests/Views/HistoryTimestampTest.php similarity index 100% rename from core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php rename to core/modules/history/src/Tests/Views/HistoryTimestampTest.php diff --git a/core/modules/image/lib/Drupal/image/Annotation/ImageEffect.php b/core/modules/image/src/Annotation/ImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Annotation/ImageEffect.php rename to core/modules/image/src/Annotation/ImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/ConfigurableImageEffectInterface.php b/core/modules/image/src/ConfigurableImageEffectInterface.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ConfigurableImageEffectInterface.php rename to core/modules/image/src/ConfigurableImageEffectInterface.php diff --git a/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php b/core/modules/image/src/Controller/ImageStyleDownloadController.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php rename to core/modules/image/src/Controller/ImageStyleDownloadController.php diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Entity/ImageStyle.php rename to core/modules/image/src/Entity/ImageStyle.php diff --git a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php b/core/modules/image/src/EventSubscriber/RouteSubscriber.php similarity index 100% rename from core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php rename to core/modules/image/src/EventSubscriber/RouteSubscriber.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php b/core/modules/image/src/Form/ImageEffectAddForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php rename to core/modules/image/src/Form/ImageEffectAddForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php b/core/modules/image/src/Form/ImageEffectDeleteForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php rename to core/modules/image/src/Form/ImageEffectDeleteForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectEditForm.php b/core/modules/image/src/Form/ImageEffectEditForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageEffectEditForm.php rename to core/modules/image/src/Form/ImageEffectEditForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectFormBase.php b/core/modules/image/src/Form/ImageEffectFormBase.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageEffectFormBase.php rename to core/modules/image/src/Form/ImageEffectFormBase.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php b/core/modules/image/src/Form/ImageStyleAddForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php rename to core/modules/image/src/Form/ImageStyleAddForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php b/core/modules/image/src/Form/ImageStyleDeleteForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php rename to core/modules/image/src/Form/ImageStyleDeleteForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php rename to core/modules/image/src/Form/ImageStyleEditForm.php diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/src/Form/ImageStyleFormBase.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php rename to core/modules/image/src/Form/ImageStyleFormBase.php diff --git a/core/modules/image/lib/Drupal/image/ImageEffectBag.php b/core/modules/image/src/ImageEffectBag.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageEffectBag.php rename to core/modules/image/src/ImageEffectBag.php diff --git a/core/modules/image/lib/Drupal/image/ImageEffectBase.php b/core/modules/image/src/ImageEffectBase.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageEffectBase.php rename to core/modules/image/src/ImageEffectBase.php diff --git a/core/modules/image/lib/Drupal/image/ImageEffectInterface.php b/core/modules/image/src/ImageEffectInterface.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageEffectInterface.php rename to core/modules/image/src/ImageEffectInterface.php diff --git a/core/modules/image/lib/Drupal/image/ImageEffectManager.php b/core/modules/image/src/ImageEffectManager.php similarity index 76% rename from core/modules/image/lib/Drupal/image/ImageEffectManager.php rename to core/modules/image/src/ImageEffectManager.php index 64e251e..1bcc028 100644 --- a/core/modules/image/lib/Drupal/image/ImageEffectManager.php +++ b/core/modules/image/src/ImageEffectManager.php @@ -21,8 +21,8 @@ class ImageEffectManager extends DefaultPluginManager { * {@inheritdoc} */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\image\Annotation' => $namespaces['Drupal\image']); - parent::__construct('Plugin/ImageEffect', $namespaces, $annotation_namespaces, 'Drupal\image\Annotation\ImageEffect'); + parent::__construct($namespaces, 'Plugin\ImageEffect', 'Drupal\image\Annotation\ImageEffect'); + $this->addAnnotationNamespace('Drupal\image\Annotation'); $this->alterInfo($module_handler, 'image_effect_info'); $this->setCacheBackend($cache_backend, $language_manager, 'image_effect'); diff --git a/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php b/core/modules/image/src/ImageStyleAccessController.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageStyleAccessController.php rename to core/modules/image/src/ImageStyleAccessController.php diff --git a/core/modules/image/lib/Drupal/image/ImageStyleInterface.php b/core/modules/image/src/ImageStyleInterface.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageStyleInterface.php rename to core/modules/image/src/ImageStyleInterface.php diff --git a/core/modules/image/lib/Drupal/image/ImageStyleListController.php b/core/modules/image/src/ImageStyleListController.php similarity index 100% rename from core/modules/image/lib/Drupal/image/ImageStyleListController.php rename to core/modules/image/src/ImageStyleListController.php diff --git a/core/modules/image/lib/Drupal/image/PathProcessor/PathProcessorImageStyles.php b/core/modules/image/src/PathProcessor/PathProcessorImageStyles.php similarity index 100% rename from core/modules/image/lib/Drupal/image/PathProcessor/PathProcessorImageStyles.php rename to core/modules/image/src/PathProcessor/PathProcessorImageStyles.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php rename to core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php b/core/modules/image/src/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php rename to core/modules/image/src/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php b/core/modules/image/src/Plugin/field/formatter/ImageFormatter.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php rename to core/modules/image/src/Plugin/field/formatter/ImageFormatter.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatterBase.php b/core/modules/image/src/Plugin/field/formatter/ImageFormatterBase.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatterBase.php rename to core/modules/image/src/Plugin/field/formatter/ImageFormatterBase.php diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php b/core/modules/image/src/Plugin/field/widget/ImageWidget.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php rename to core/modules/image/src/Plugin/field/widget/ImageWidget.php diff --git a/core/modules/image/lib/Drupal/image/Tests/FileMoveTest.php b/core/modules/image/src/Tests/FileMoveTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/FileMoveTest.php rename to core/modules/image/src/Tests/FileMoveTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php rename to core/modules/image/src/Tests/ImageAdminStylesTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php rename to core/modules/image/src/Tests/ImageDimensionsTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageEffectsTest.php b/core/modules/image/src/Tests/ImageEffectsTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageEffectsTest.php rename to core/modules/image/src/Tests/ImageEffectsTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php rename to core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php rename to core/modules/image/src/Tests/ImageFieldDisplayTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php rename to core/modules/image/src/Tests/ImageFieldTestBase.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldValidateTest.php rename to core/modules/image/src/Tests/ImageFieldValidateTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php b/core/modules/image/src/Tests/ImageItemTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php rename to core/modules/image/src/Tests/ImageItemTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageStyleFlushTest.php rename to core/modules/image/src/Tests/ImageStyleFlushTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php rename to core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Tests/ImageThemeFunctionTest.php rename to core/modules/image/src/Tests/ImageThemeFunctionTest.php diff --git a/core/modules/image/lib/Drupal/image/Type/ImageField.php b/core/modules/image/src/Type/ImageField.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Type/ImageField.php rename to core/modules/image/src/Type/ImageField.php diff --git a/core/modules/image/lib/Drupal/image/Type/ImageItem.php b/core/modules/image/src/Type/ImageItem.php similarity index 100% rename from core/modules/image/lib/Drupal/image/Type/ImageItem.php rename to core/modules/image/src/Type/ImageItem.php diff --git a/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php b/core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/NullTestImageEffect.php similarity index 100% rename from core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php rename to core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/NullTestImageEffect.php diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/src/Entity/Language.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Entity/Language.php rename to core/modules/language/src/Entity/Language.php diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php b/core/modules/language/src/Form/LanguageDeleteForm.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php rename to core/modules/language/src/Form/LanguageDeleteForm.php diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationBrowserDeleteForm.php b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Form/NegotiationBrowserDeleteForm.php rename to core/modules/language/src/Form/NegotiationBrowserDeleteForm.php diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php b/core/modules/language/src/Form/NegotiationSelectedForm.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php rename to core/modules/language/src/Form/NegotiationSelectedForm.php diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php b/core/modules/language/src/Form/NegotiationSessionForm.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php rename to core/modules/language/src/Form/NegotiationSessionForm.php diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php b/core/modules/language/src/Form/NegotiationUrlForm.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php rename to core/modules/language/src/Form/NegotiationUrlForm.php diff --git a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php similarity index 100% rename from core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php rename to core/modules/language/src/HttpKernel/PathProcessorLanguage.php diff --git a/core/modules/language/lib/Drupal/language/LanguageAccessController.php b/core/modules/language/src/LanguageAccessController.php similarity index 100% rename from core/modules/language/lib/Drupal/language/LanguageAccessController.php rename to core/modules/language/src/LanguageAccessController.php diff --git a/core/modules/language/lib/Drupal/language/LanguageConfigContext.php b/core/modules/language/src/LanguageConfigContext.php similarity index 100% rename from core/modules/language/lib/Drupal/language/LanguageConfigContext.php rename to core/modules/language/src/LanguageConfigContext.php diff --git a/core/modules/language/lib/Drupal/language/LanguageInterface.php b/core/modules/language/src/LanguageInterface.php similarity index 100% rename from core/modules/language/lib/Drupal/language/LanguageInterface.php rename to core/modules/language/src/LanguageInterface.php diff --git a/core/modules/language/lib/Drupal/language/LanguageListController.php b/core/modules/language/src/LanguageListController.php similarity index 100% rename from core/modules/language/lib/Drupal/language/LanguageListController.php rename to core/modules/language/src/LanguageListController.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php b/core/modules/language/src/Plugin/Block/LanguageBlock.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php rename to core/modules/language/src/Plugin/Block/LanguageBlock.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php b/core/modules/language/src/Plugin/Condition/Language.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php rename to core/modules/language/src/Plugin/Condition/Language.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/Derivative/LanguageBlock.php b/core/modules/language/src/Plugin/Derivative/LanguageBlock.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/Derivative/LanguageBlock.php rename to core/modules/language/src/Plugin/Derivative/LanguageBlock.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/src/Plugin/views/argument/LanguageArgument.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php rename to core/modules/language/src/Plugin/views/argument/LanguageArgument.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/src/Plugin/views/field/LanguageField.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php rename to core/modules/language/src/Plugin/views/field/LanguageField.php diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/src/Plugin/views/filter/LanguageFilter.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php rename to core/modules/language/src/Plugin/views/filter/LanguageFilter.php diff --git a/core/modules/language/lib/Drupal/language/Tests/Condition/LanguageConditionTest.php b/core/modules/language/src/Tests/Condition/LanguageConditionTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/Condition/LanguageConditionTest.php rename to core/modules/language/src/Tests/Condition/LanguageConditionTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php b/core/modules/language/src/Tests/LanguageBrowserDetectionUnitTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php rename to core/modules/language/src/Tests/LanguageBrowserDetectionUnitTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php rename to core/modules/language/src/Tests/LanguageConfigurationElementTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php rename to core/modules/language/src/Tests/LanguageConfigurationTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php rename to core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php rename to core/modules/language/src/Tests/LanguageDependencyInjectionTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php rename to core/modules/language/src/Tests/LanguageListTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php rename to core/modules/language/src/Tests/LanguageNegotiationInfoTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguagePathMonolingualTest.php b/core/modules/language/src/Tests/LanguagePathMonolingualTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguagePathMonolingualTest.php rename to core/modules/language/src/Tests/LanguagePathMonolingualTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php rename to core/modules/language/src/Tests/LanguageSwitchingTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php rename to core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php rename to core/modules/language/src/Tests/LanguageUrlRewritingTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php b/core/modules/language/src/Tests/Views/ArgumentLanguageTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php rename to core/modules/language/src/Tests/Views/ArgumentLanguageTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php b/core/modules/language/src/Tests/Views/FieldLanguageTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php rename to core/modules/language/src/Tests/Views/FieldLanguageTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php b/core/modules/language/src/Tests/Views/FilterLanguageTest.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php rename to core/modules/language/src/Tests/Views/FilterLanguageTest.php diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/LanguageTestBase.php b/core/modules/language/src/Tests/Views/LanguageTestBase.php similarity index 100% rename from core/modules/language/lib/Drupal/language/Tests/Views/LanguageTestBase.php rename to core/modules/language/src/Tests/Views/LanguageTestBase.php diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php similarity index 100% rename from core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php rename to core/modules/language/tests/language_test/src/Controller/LanguageTestController.php diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php b/core/modules/language/tests/language_test/src/LanguageTestManager.php similarity index 100% rename from core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php rename to core/modules/language/tests/language_test/src/LanguageTestManager.php diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestServiceProvider.php b/core/modules/language/tests/language_test/src/LanguageTestServiceProvider.php similarity index 100% rename from core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestServiceProvider.php rename to core/modules/language/tests/language_test/src/LanguageTestServiceProvider.php diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Type/LayoutManager.php b/core/modules/layout/lib/Drupal/layout/Plugin/Type/LayoutManager.php new file mode 100644 index 0000000..f169d06 --- /dev/null +++ b/core/modules/layout/lib/Drupal/layout/Plugin/Type/LayoutManager.php @@ -0,0 +1,40 @@ + 'Drupal\layout\Plugin\Layout\StaticLayout', + ); + + /** + * Overrides Drupal\Component\Plugin\PluginManagerBase::__construct(). + * + * @param \Traversable $namespaces + * An object that implements \Traversable which contains the root paths + * keyed by the corresponding namespace to look for plugin implementations, + */ + public function __construct(\Traversable $namespaces) { + // Create layout plugin derivatives from declaratively defined layouts. + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\Layout'); + $this->discovery = new DerivativeDiscoveryDecorator($this->discovery); + $this->discovery = new ProcessDecorator($this->discovery, array($this, 'processDefinition')); + + $this->factory = new ReflectionFactory($this->discovery); + } +} diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/field_type/LinkItem.php b/core/modules/link/src/Plugin/field/field_type/LinkItem.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Plugin/field/field_type/LinkItem.php rename to core/modules/link/src/Plugin/field/field_type/LinkItem.php diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/src/Plugin/field/formatter/LinkFormatter.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php rename to core/modules/link/src/Plugin/field/formatter/LinkFormatter.php diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/field/formatter/LinkSeparateFormatter.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php rename to core/modules/link/src/Plugin/field/formatter/LinkSeparateFormatter.php diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/widget/LinkWidget.php b/core/modules/link/src/Plugin/field/widget/LinkWidget.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Plugin/field/widget/LinkWidget.php rename to core/modules/link/src/Plugin/field/widget/LinkWidget.php diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php rename to core/modules/link/src/Tests/LinkFieldTest.php diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php b/core/modules/link/src/Tests/LinkFieldUITest.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php rename to core/modules/link/src/Tests/LinkFieldUITest.php diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php b/core/modules/link/src/Tests/LinkItemTest.php similarity index 100% rename from core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php rename to core/modules/link/src/Tests/LinkItemTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php b/core/modules/locale/src/Controller/LocaleController.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php rename to core/modules/locale/src/Controller/LocaleController.php diff --git a/core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php b/core/modules/locale/src/Form/LocaleSettingsForm.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php rename to core/modules/locale/src/Form/LocaleSettingsForm.php diff --git a/core/modules/locale/lib/Drupal/locale/Gettext.php b/core/modules/locale/src/Gettext.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Gettext.php rename to core/modules/locale/src/Gettext.php diff --git a/core/modules/locale/lib/Drupal/locale/Locale.php b/core/modules/locale/src/Locale.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Locale.php rename to core/modules/locale/src/Locale.php diff --git a/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php rename to core/modules/locale/src/LocaleConfigManager.php diff --git a/core/modules/locale/lib/Drupal/locale/LocaleConfigSubscriber.php b/core/modules/locale/src/LocaleConfigSubscriber.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/LocaleConfigSubscriber.php rename to core/modules/locale/src/LocaleConfigSubscriber.php diff --git a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php b/core/modules/locale/src/LocaleLookup.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/LocaleLookup.php rename to core/modules/locale/src/LocaleLookup.php diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTranslation.php b/core/modules/locale/src/LocaleTranslation.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/LocaleTranslation.php rename to core/modules/locale/src/LocaleTranslation.php diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php b/core/modules/locale/src/LocaleTypedConfig.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php rename to core/modules/locale/src/LocaleTypedConfig.php diff --git a/core/modules/locale/lib/Drupal/locale/PoDatabaseReader.php b/core/modules/locale/src/PoDatabaseReader.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/PoDatabaseReader.php rename to core/modules/locale/src/PoDatabaseReader.php diff --git a/core/modules/locale/lib/Drupal/locale/PoDatabaseWriter.php b/core/modules/locale/src/PoDatabaseWriter.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/PoDatabaseWriter.php rename to core/modules/locale/src/PoDatabaseWriter.php diff --git a/core/modules/locale/lib/Drupal/locale/SourceString.php b/core/modules/locale/src/SourceString.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/SourceString.php rename to core/modules/locale/src/SourceString.php diff --git a/core/modules/locale/lib/Drupal/locale/StringBase.php b/core/modules/locale/src/StringBase.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/StringBase.php rename to core/modules/locale/src/StringBase.php diff --git a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php rename to core/modules/locale/src/StringDatabaseStorage.php diff --git a/core/modules/locale/lib/Drupal/locale/StringInterface.php b/core/modules/locale/src/StringInterface.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/StringInterface.php rename to core/modules/locale/src/StringInterface.php diff --git a/core/modules/locale/lib/Drupal/locale/StringStorageException.php b/core/modules/locale/src/StringStorageException.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/StringStorageException.php rename to core/modules/locale/src/StringStorageException.php diff --git a/core/modules/locale/lib/Drupal/locale/StringStorageInterface.php b/core/modules/locale/src/StringStorageInterface.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/StringStorageInterface.php rename to core/modules/locale/src/StringStorageInterface.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleConfigTranslationTest.php rename to core/modules/locale/src/Tests/LocaleConfigTranslationTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php b/core/modules/locale/src/Tests/LocaleContentTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php rename to core/modules/locale/src/Tests/LocaleContentTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php b/core/modules/locale/src/Tests/LocaleExportTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php rename to core/modules/locale/src/Tests/LocaleExportTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php rename to core/modules/locale/src/Tests/LocaleImportFunctionalTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslation.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php rename to core/modules/locale/src/Tests/LocaleJavascriptTranslation.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleLibraryInfoAlterTest.php b/core/modules/locale/src/Tests/LocaleLibraryInfoAlterTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleLibraryInfoAlterTest.php rename to core/modules/locale/src/Tests/LocaleLibraryInfoAlterTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php b/core/modules/locale/src/Tests/LocalePathTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php rename to core/modules/locale/src/Tests/LocalePathTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php b/core/modules/locale/src/Tests/LocalePluralFormatTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php rename to core/modules/locale/src/Tests/LocalePluralFormatTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleStringTest.php b/core/modules/locale/src/Tests/LocaleStringTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleStringTest.php rename to core/modules/locale/src/Tests/LocaleStringTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php rename to core/modules/locale/src/Tests/LocaleTranslationUiTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallFrenchTest.php b/core/modules/locale/src/Tests/LocaleUninstallFrenchTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallFrenchTest.php rename to core/modules/locale/src/Tests/LocaleUninstallFrenchTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php b/core/modules/locale/src/Tests/LocaleUninstallTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php rename to core/modules/locale/src/Tests/LocaleUninstallTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php rename to core/modules/locale/src/Tests/LocaleUpdateBase.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateCronTest.php b/core/modules/locale/src/Tests/LocaleUpdateCronTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateCronTest.php rename to core/modules/locale/src/Tests/LocaleUpdateCronTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php rename to core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php b/core/modules/locale/src/Tests/LocaleUpdateTest.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php rename to core/modules/locale/src/Tests/LocaleUpdateTest.php diff --git a/core/modules/locale/lib/Drupal/locale/TranslationString.php b/core/modules/locale/src/TranslationString.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/TranslationString.php rename to core/modules/locale/src/TranslationString.php diff --git a/core/modules/locale/lib/Drupal/locale/TranslationsStream.php b/core/modules/locale/src/TranslationsStream.php similarity index 100% rename from core/modules/locale/lib/Drupal/locale/TranslationsStream.php rename to core/modules/locale/src/TranslationsStream.php diff --git a/core/modules/locale/tests/Drupal/locale/Tests/LocaleTranslationTest.php b/core/modules/locale/tests/src/LocaleTranslationTest.php similarity index 100% rename from core/modules/locale/tests/Drupal/locale/Tests/LocaleTranslationTest.php rename to core/modules/locale/tests/src/LocaleTranslationTest.php diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/src/Controller/MenuController.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Controller/MenuController.php rename to core/modules/menu/src/Controller/MenuController.php diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/src/Form/MenuDeleteForm.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php rename to core/modules/menu/src/Form/MenuDeleteForm.php diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php b/core/modules/menu/src/Form/MenuLinkDeleteForm.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php rename to core/modules/menu/src/Form/MenuLinkDeleteForm.php diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php b/core/modules/menu/src/Form/MenuLinkResetForm.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php rename to core/modules/menu/src/Form/MenuLinkResetForm.php diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/src/MenuFormController.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/MenuFormController.php rename to core/modules/menu/src/MenuFormController.php diff --git a/core/modules/menu/lib/Drupal/menu/MenuListController.php b/core/modules/menu/src/MenuListController.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/MenuListController.php rename to core/modules/menu/src/MenuListController.php diff --git a/core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php b/core/modules/menu/src/MenuSettingsForm.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php rename to core/modules/menu/src/MenuSettingsForm.php diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php b/core/modules/menu/src/Plugin/Block/MenuBlock.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php rename to core/modules/menu/src/Plugin/Block/MenuBlock.php diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/Derivative/MenuBlock.php b/core/modules/menu/src/Plugin/Derivative/MenuBlock.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Plugin/Derivative/MenuBlock.php rename to core/modules/menu/src/Plugin/Derivative/MenuBlock.php diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php b/core/modules/menu/src/Tests/MenuLanguageTest.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php rename to core/modules/menu/src/Tests/MenuLanguageTest.php diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/src/Tests/MenuNodeTest.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php rename to core/modules/menu/src/Tests/MenuNodeTest.php diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/src/Tests/MenuTest.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php rename to core/modules/menu/src/Tests/MenuTest.php diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuWebTestBase.php b/core/modules/menu/src/Tests/MenuWebTestBase.php similarity index 100% rename from core/modules/menu/lib/Drupal/menu/Tests/MenuWebTestBase.php rename to core/modules/menu/src/Tests/MenuWebTestBase.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/src/Entity/MenuLink.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php rename to core/modules/menu_link/src/Entity/MenuLink.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php b/core/modules/menu_link/src/MenuLinkAccessController.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php rename to core/modules/menu_link/src/MenuLinkAccessController.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkBreadcrumbBuilder.php b/core/modules/menu_link/src/MenuLinkBreadcrumbBuilder.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkBreadcrumbBuilder.php rename to core/modules/menu_link/src/MenuLinkBreadcrumbBuilder.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/src/MenuLinkFormController.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php rename to core/modules/menu_link/src/MenuLinkFormController.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php b/core/modules/menu_link/src/MenuLinkInterface.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php rename to core/modules/menu_link/src/MenuLinkInterface.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/src/MenuLinkStorageController.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php rename to core/modules/menu_link/src/MenuLinkStorageController.php diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php b/core/modules/menu_link/src/MenuLinkStorageControllerInterface.php similarity index 100% rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php rename to core/modules/menu_link/src/MenuLinkStorageControllerInterface.php diff --git a/core/modules/menu_link/tests/Drupal/menu_link/Tests/Plugin/Core/Entity/MenuLinkTest.php b/core/modules/menu_link/tests/src/Plugin/Core/Entity/MenuLinkTest.php similarity index 100% rename from core/modules/menu_link/tests/Drupal/menu_link/Tests/Plugin/Core/Entity/MenuLinkTest.php rename to core/modules/menu_link/tests/src/Plugin/Core/Entity/MenuLinkTest.php diff --git a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php b/core/modules/node/src/Access/NodeRevisionAccessCheck.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php rename to core/modules/node/src/Access/NodeRevisionAccessCheck.php diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/src/Entity/Node.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Entity/Node.php rename to core/modules/node/src/Entity/Node.php diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Entity/NodeType.php rename to core/modules/node/src/Entity/NodeType.php diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/src/Form/DeleteMultiple.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php rename to core/modules/node/src/Form/DeleteMultiple.php diff --git a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php b/core/modules/node/src/Form/NodeDeleteForm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php rename to core/modules/node/src/Form/NodeDeleteForm.php diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php b/core/modules/node/src/Form/NodeRevisionDeleteForm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php rename to core/modules/node/src/Form/NodeRevisionDeleteForm.php diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php rename to core/modules/node/src/Form/NodeRevisionRevertForm.php diff --git a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php b/core/modules/node/src/Form/NodeTypeDeleteConfirm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php rename to core/modules/node/src/Form/NodeTypeDeleteConfirm.php diff --git a/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php b/core/modules/node/src/Form/RebuildPermissionsForm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php rename to core/modules/node/src/Form/RebuildPermissionsForm.php diff --git a/core/modules/node/lib/Drupal/node/NodeAccessController.php b/core/modules/node/src/NodeAccessController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeAccessController.php rename to core/modules/node/src/NodeAccessController.php diff --git a/core/modules/node/lib/Drupal/node/NodeAccessControllerInterface.php b/core/modules/node/src/NodeAccessControllerInterface.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeAccessControllerInterface.php rename to core/modules/node/src/NodeAccessControllerInterface.php diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/src/NodeFormController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeFormController.php rename to core/modules/node/src/NodeFormController.php diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php b/core/modules/node/src/NodeGrantDatabaseStorage.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php rename to core/modules/node/src/NodeGrantDatabaseStorage.php diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorageInterface.php rename to core/modules/node/src/NodeGrantDatabaseStorageInterface.php diff --git a/core/modules/node/lib/Drupal/node/NodeInterface.php b/core/modules/node/src/NodeInterface.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeInterface.php rename to core/modules/node/src/NodeInterface.php diff --git a/core/modules/node/lib/Drupal/node/NodeRenderController.php b/core/modules/node/src/NodeRenderController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeRenderController.php rename to core/modules/node/src/NodeRenderController.php diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/src/NodeStorageController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeStorageController.php rename to core/modules/node/src/NodeStorageController.php diff --git a/core/modules/node/lib/Drupal/node/NodeTranslationController.php b/core/modules/node/src/NodeTranslationController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeTranslationController.php rename to core/modules/node/src/NodeTranslationController.php diff --git a/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php b/core/modules/node/src/NodeTypeAccessController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeTypeAccessController.php rename to core/modules/node/src/NodeTypeAccessController.php diff --git a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php b/core/modules/node/src/NodeTypeFormController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeTypeFormController.php rename to core/modules/node/src/NodeTypeFormController.php diff --git a/core/modules/node/lib/Drupal/node/NodeTypeInterface.php b/core/modules/node/src/NodeTypeInterface.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeTypeInterface.php rename to core/modules/node/src/NodeTypeInterface.php diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/src/NodeTypeListController.php similarity index 100% rename from core/modules/node/lib/Drupal/node/NodeTypeListController.php rename to core/modules/node/src/NodeTypeListController.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php b/core/modules/node/src/Plugin/Action/AssignOwnerNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php rename to core/modules/node/src/Plugin/Action/AssignOwnerNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php b/core/modules/node/src/Plugin/Action/DeleteNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php rename to core/modules/node/src/Plugin/Action/DeleteNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php b/core/modules/node/src/Plugin/Action/DemoteNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php rename to core/modules/node/src/Plugin/Action/DemoteNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php b/core/modules/node/src/Plugin/Action/PromoteNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php rename to core/modules/node/src/Plugin/Action/PromoteNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php b/core/modules/node/src/Plugin/Action/PublishNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php rename to core/modules/node/src/Plugin/Action/PublishNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php b/core/modules/node/src/Plugin/Action/SaveNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php rename to core/modules/node/src/Plugin/Action/SaveNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php b/core/modules/node/src/Plugin/Action/StickyNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php rename to core/modules/node/src/Plugin/Action/StickyNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php rename to core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php b/core/modules/node/src/Plugin/Action/UnpublishNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php rename to core/modules/node/src/Plugin/Action/UnpublishNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php b/core/modules/node/src/Plugin/Action/UnstickyNode.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php rename to core/modules/node/src/Plugin/Action/UnstickyNode.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/src/Plugin/Block/RecentContentBlock.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php rename to core/modules/node/src/Plugin/Block/RecentContentBlock.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/src/Plugin/Block/SyndicateBlock.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php rename to core/modules/node/src/Plugin/Block/SyndicateBlock.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php b/core/modules/node/src/Plugin/Condition/NodeType.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php rename to core/modules/node/src/Plugin/Condition/NodeType.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php rename to core/modules/node/src/Plugin/Search/NodeSearch.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraint.php b/core/modules/node/src/Plugin/Validation/Constraint/NodeChangedConstraint.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraint.php rename to core/modules/node/src/Plugin/Validation/Constraint/NodeChangedConstraint.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php b/core/modules/node/src/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php rename to core/modules/node/src/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php b/core/modules/node/src/Plugin/entity_reference/selection/NodeSelection.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php rename to core/modules/node/src/Plugin/entity_reference/selection/NodeSelection.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php b/core/modules/node/src/Plugin/views/area/ListingEmpty.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php rename to core/modules/node/src/Plugin/views/area/ListingEmpty.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php b/core/modules/node/src/Plugin/views/argument/Nid.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php rename to core/modules/node/src/Plugin/views/argument/Nid.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php rename to core/modules/node/src/Plugin/views/argument/Type.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/src/Plugin/views/argument/UidRevision.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php rename to core/modules/node/src/Plugin/views/argument/UidRevision.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php rename to core/modules/node/src/Plugin/views/argument/Vid.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php b/core/modules/node/src/Plugin/views/argument_default/Node.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php rename to core/modules/node/src/Plugin/views/argument_default/Node.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/core/modules/node/src/Plugin/views/argument_validator/Node.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php rename to core/modules/node/src/Plugin/views/argument_validator/Node.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/src/Plugin/views/field/Language.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php rename to core/modules/node/src/Plugin/views/field/Language.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/src/Plugin/views/field/Link.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php rename to core/modules/node/src/Plugin/views/field/Link.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/core/modules/node/src/Plugin/views/field/LinkDelete.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php rename to core/modules/node/src/Plugin/views/field/LinkDelete.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/core/modules/node/src/Plugin/views/field/LinkEdit.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php rename to core/modules/node/src/Plugin/views/field/LinkEdit.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/src/Plugin/views/field/Node.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php rename to core/modules/node/src/Plugin/views/field/Node.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php b/core/modules/node/src/Plugin/views/field/NodeBulkForm.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php rename to core/modules/node/src/Plugin/views/field/NodeBulkForm.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/src/Plugin/views/field/Path.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php rename to core/modules/node/src/Plugin/views/field/Path.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/src/Plugin/views/field/Revision.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php rename to core/modules/node/src/Plugin/views/field/Revision.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/src/Plugin/views/field/RevisionLink.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php rename to core/modules/node/src/Plugin/views/field/RevisionLink.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php rename to core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php rename to core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/src/Plugin/views/field/Type.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php rename to core/modules/node/src/Plugin/views/field/Type.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/src/Plugin/views/filter/Access.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php rename to core/modules/node/src/Plugin/views/filter/Access.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/src/Plugin/views/filter/Status.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php rename to core/modules/node/src/Plugin/views/filter/Status.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/src/Plugin/views/filter/UidRevision.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php rename to core/modules/node/src/Plugin/views/filter/UidRevision.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php b/core/modules/node/src/Plugin/views/row/NodeRow.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php rename to core/modules/node/src/Plugin/views/row/NodeRow.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php rename to core/modules/node/src/Plugin/views/row/Rss.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php rename to core/modules/node/src/Plugin/views/wizard/Node.php diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php rename to core/modules/node/src/Plugin/views/wizard/NodeRevision.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php b/core/modules/node/src/Tests/Condition/NodeConditionTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php rename to core/modules/node/src/Tests/Condition/NodeConditionTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Config/NodeImportChangeTest.php b/core/modules/node/src/Tests/Config/NodeImportChangeTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Config/NodeImportChangeTest.php rename to core/modules/node/src/Tests/Config/NodeImportChangeTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Config/NodeImportCreateTest.php b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Config/NodeImportCreateTest.php rename to core/modules/node/src/Tests/Config/NodeImportCreateTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php rename to core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php rename to core/modules/node/src/Tests/NodeAccessBaseTableTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php rename to core/modules/node/src/Tests/NodeAccessFieldTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php rename to core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareTest.php rename to core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php b/core/modules/node/src/Tests/NodeAccessLanguageTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php rename to core/modules/node/src/Tests/NodeAccessLanguageTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessPagerTest.php rename to core/modules/node/src/Tests/NodeAccessPagerTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessRebuildTest.php b/core/modules/node/src/Tests/NodeAccessRebuildTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessRebuildTest.php rename to core/modules/node/src/Tests/NodeAccessRebuildTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessRecordsTest.php b/core/modules/node/src/Tests/NodeAccessRecordsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessRecordsTest.php rename to core/modules/node/src/Tests/NodeAccessRecordsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php b/core/modules/node/src/Tests/NodeAccessTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php rename to core/modules/node/src/Tests/NodeAccessTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php b/core/modules/node/src/Tests/NodeAdminTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php rename to core/modules/node/src/Tests/NodeAdminTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php rename to core/modules/node/src/Tests/NodeBlockFunctionalTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBuildContentTest.php b/core/modules/node/src/Tests/NodeBuildContentTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeBuildContentTest.php rename to core/modules/node/src/Tests/NodeBuildContentTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php rename to core/modules/node/src/Tests/NodeCreationTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeEntityViewModeAlterTest.php rename to core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php b/core/modules/node/src/Tests/NodeFieldMultilingualTestCase.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php rename to core/modules/node/src/Tests/NodeFieldMultilingualTestCase.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFormButtonsTest.php b/core/modules/node/src/Tests/NodeFormButtonsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeFormButtonsTest.php rename to core/modules/node/src/Tests/NodeFormButtonsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLoadHooksTest.php b/core/modules/node/src/Tests/NodeLoadHooksTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeLoadHooksTest.php rename to core/modules/node/src/Tests/NodeLoadHooksTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLoadMultipleTest.php b/core/modules/node/src/Tests/NodeLoadMultipleTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeLoadMultipleTest.php rename to core/modules/node/src/Tests/NodeLoadMultipleTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php b/core/modules/node/src/Tests/NodePostSettingsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php rename to core/modules/node/src/Tests/NodePostSettingsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php b/core/modules/node/src/Tests/NodeQueryAlterTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php rename to core/modules/node/src/Tests/NodeQueryAlterTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRSSContentTest.php b/core/modules/node/src/Tests/NodeRSSContentTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeRSSContentTest.php rename to core/modules/node/src/Tests/NodeRSSContentTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionPermissionsTest.php rename to core/modules/node/src/Tests/NodeRevisionPermissionsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionsAllTestCase.php b/core/modules/node/src/Tests/NodeRevisionsAllTestCase.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionsAllTestCase.php rename to core/modules/node/src/Tests/NodeRevisionsAllTestCase.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionsTest.php b/core/modules/node/src/Tests/NodeRevisionsTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionsTest.php rename to core/modules/node/src/Tests/NodeRevisionsTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php b/core/modules/node/src/Tests/NodeSaveTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php rename to core/modules/node/src/Tests/NodeSaveTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeSyndicateBlockTest.php b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeSyndicateBlockTest.php rename to core/modules/node/src/Tests/NodeSyndicateBlockTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php b/core/modules/node/src/Tests/NodeTestBase.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php rename to core/modules/node/src/Tests/NodeTestBase.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTitleTest.php rename to core/modules/node/src/Tests/NodeTitleTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTitleXSSTest.php b/core/modules/node/src/Tests/NodeTitleXSSTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTitleXSSTest.php rename to core/modules/node/src/Tests/NodeTitleXSSTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php rename to core/modules/node/src/Tests/NodeTokenReplaceTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php rename to core/modules/node/src/Tests/NodeTranslationUITest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php rename to core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php b/core/modules/node/src/Tests/NodeTypePersistenceTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php rename to core/modules/node/src/Tests/NodeTypePersistenceTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php rename to core/modules/node/src/Tests/NodeTypeTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php b/core/modules/node/src/Tests/NodeValidationTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php rename to core/modules/node/src/Tests/NodeValidationTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php b/core/modules/node/src/Tests/PageEditTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/PageEditTest.php rename to core/modules/node/src/Tests/PageEditTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php rename to core/modules/node/src/Tests/PagePreviewTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/PageViewTest.php b/core/modules/node/src/Tests/PageViewTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/PageViewTest.php rename to core/modules/node/src/Tests/PageViewTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php b/core/modules/node/src/Tests/SummaryLengthTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php rename to core/modules/node/src/Tests/SummaryLengthTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/BulkFormTest.php b/core/modules/node/src/Tests/Views/BulkFormTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/BulkFormTest.php rename to core/modules/node/src/Tests/Views/BulkFormTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php b/core/modules/node/src/Tests/Views/FieldTypeTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php rename to core/modules/node/src/Tests/Views/FieldTypeTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php rename to core/modules/node/src/Tests/Views/FilterUidRevisionTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php b/core/modules/node/src/Tests/Views/FrontpageTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php rename to core/modules/node/src/Tests/Views/FrontpageTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php b/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php rename to core/modules/node/src/Tests/Views/NodeContextualLinksTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeIntegrationTest.php b/core/modules/node/src/Tests/Views/NodeIntegrationTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeIntegrationTest.php rename to core/modules/node/src/Tests/Views/NodeIntegrationTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeTestBase.php b/core/modules/node/src/Tests/Views/NodeTestBase.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeTestBase.php rename to core/modules/node/src/Tests/Views/NodeTestBase.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php b/core/modules/node/src/Tests/Views/RevisionRelationships.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php rename to core/modules/node/src/Tests/Views/RevisionRelationships.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php b/core/modules/node/src/Tests/Views/RowPluginTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php rename to core/modules/node/src/Tests/Views/RowPluginTest.php diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php b/core/modules/node/src/Tests/Views/StatusExtraTest.php similarity index 100% rename from core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php rename to core/modules/node/src/Tests/Views/StatusExtraTest.php diff --git a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php b/core/modules/node/tests/modules/node_test/src/NodeTest.php similarity index 100% rename from core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php rename to core/modules/node/tests/modules/node_test/src/NodeTest.php diff --git a/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php similarity index 100% rename from core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php rename to core/modules/node/tests/src/Plugin/views/field/NodeBulkFormTest.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/DecimalItem.php b/core/modules/number/src/Plugin/field/field_type/DecimalItem.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/DecimalItem.php rename to core/modules/number/src/Plugin/field/field_type/DecimalItem.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/FloatItem.php b/core/modules/number/src/Plugin/field/field_type/FloatItem.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/FloatItem.php rename to core/modules/number/src/Plugin/field/field_type/FloatItem.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/IntegerItem.php b/core/modules/number/src/Plugin/field/field_type/IntegerItem.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/IntegerItem.php rename to core/modules/number/src/Plugin/field/field_type/IntegerItem.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/NumberItemBase.php b/core/modules/number/src/Plugin/field/field_type/NumberItemBase.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/NumberItemBase.php rename to core/modules/number/src/Plugin/field/field_type/NumberItemBase.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php b/core/modules/number/src/Plugin/field/formatter/DefaultNumberFormatter.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php rename to core/modules/number/src/Plugin/field/formatter/DefaultNumberFormatter.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php b/core/modules/number/src/Plugin/field/formatter/NumberDecimalFormatter.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php rename to core/modules/number/src/Plugin/field/formatter/NumberDecimalFormatter.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php b/core/modules/number/src/Plugin/field/formatter/NumberIntegerFormatter.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php rename to core/modules/number/src/Plugin/field/formatter/NumberIntegerFormatter.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php b/core/modules/number/src/Plugin/field/formatter/NumberUnformattedFormatter.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php rename to core/modules/number/src/Plugin/field/formatter/NumberUnformattedFormatter.php diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php b/core/modules/number/src/Plugin/field/widget/NumberWidget.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php rename to core/modules/number/src/Plugin/field/widget/NumberWidget.php diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php b/core/modules/number/src/Tests/NumberFieldTest.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php rename to core/modules/number/src/Tests/NumberFieldTest.php diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php b/core/modules/number/src/Tests/NumberItemTest.php similarity index 100% rename from core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php rename to core/modules/number/src/Tests/NumberItemTest.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php b/core/modules/options/src/Plugin/field/formatter/OptionsDefaultFormatter.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php rename to core/modules/options/src/Plugin/field/formatter/OptionsDefaultFormatter.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php b/core/modules/options/src/Plugin/field/formatter/OptionsKeyFormatter.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php rename to core/modules/options/src/Plugin/field/formatter/OptionsKeyFormatter.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/ButtonsWidget.php b/core/modules/options/src/Plugin/field/widget/ButtonsWidget.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/ButtonsWidget.php rename to core/modules/options/src/Plugin/field/widget/ButtonsWidget.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/OnOffWidget.php b/core/modules/options/src/Plugin/field/widget/OnOffWidget.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/OnOffWidget.php rename to core/modules/options/src/Plugin/field/widget/OnOffWidget.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/OptionsWidgetBase.php b/core/modules/options/src/Plugin/field/widget/OptionsWidgetBase.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/OptionsWidgetBase.php rename to core/modules/options/src/Plugin/field/widget/OptionsWidgetBase.php diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/SelectWidget.php b/core/modules/options/src/Plugin/field/widget/SelectWidget.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/SelectWidget.php rename to core/modules/options/src/Plugin/field/widget/SelectWidget.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php b/core/modules/options/src/Tests/OptionsDynamicValuesTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php rename to core/modules/options/src/Tests/OptionsDynamicValuesTest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php b/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php rename to core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/src/Tests/OptionsFieldTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php rename to core/modules/options/src/Tests/OptionsFieldTest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php rename to core/modules/options/src/Tests/OptionsFieldUITest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php rename to core/modules/options/src/Tests/OptionsFieldUnitTestBase.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php b/core/modules/options/src/Tests/OptionsFormattersTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php rename to core/modules/options/src/Tests/OptionsFormattersTest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php rename to core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php b/core/modules/options/src/Tests/OptionsWidgetsTest.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php rename to core/modules/options/src/Tests/OptionsWidgetsTest.php diff --git a/core/modules/options/lib/Drupal/options/Type/ListBooleanItem.php b/core/modules/options/src/Type/ListBooleanItem.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Type/ListBooleanItem.php rename to core/modules/options/src/Type/ListBooleanItem.php diff --git a/core/modules/options/lib/Drupal/options/Type/ListFloatItem.php b/core/modules/options/src/Type/ListFloatItem.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Type/ListFloatItem.php rename to core/modules/options/src/Type/ListFloatItem.php diff --git a/core/modules/options/lib/Drupal/options/Type/ListIntegerItem.php b/core/modules/options/src/Type/ListIntegerItem.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Type/ListIntegerItem.php rename to core/modules/options/src/Type/ListIntegerItem.php diff --git a/core/modules/options/lib/Drupal/options/Type/ListTextItem.php b/core/modules/options/src/Type/ListTextItem.php similarity index 100% rename from core/modules/options/lib/Drupal/options/Type/ListTextItem.php rename to core/modules/options/src/Type/ListTextItem.php diff --git a/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php b/core/modules/overlay/src/Access/DismissMessageAccessCheck.php similarity index 100% rename from core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php rename to core/modules/overlay/src/Access/DismissMessageAccessCheck.php diff --git a/core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php b/core/modules/overlay/src/Controller/OverlayController.php similarity index 100% rename from core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php rename to core/modules/overlay/src/Controller/OverlayController.php diff --git a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php b/core/modules/overlay/src/EventSubscriber/OverlaySubscriber.php similarity index 100% rename from core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php rename to core/modules/overlay/src/EventSubscriber/OverlaySubscriber.php diff --git a/core/modules/overlay/lib/Drupal/overlay/Tests/OverlayCloseTest.php b/core/modules/overlay/src/Tests/OverlayCloseTest.php similarity index 100% rename from core/modules/overlay/lib/Drupal/overlay/Tests/OverlayCloseTest.php rename to core/modules/overlay/src/Tests/OverlayCloseTest.php diff --git a/core/modules/overlay/lib/Drupal/overlay/Tests/OverlaySettingTest.php b/core/modules/overlay/src/Tests/OverlaySettingTest.php similarity index 100% rename from core/modules/overlay/lib/Drupal/overlay/Tests/OverlaySettingTest.php rename to core/modules/overlay/src/Tests/OverlaySettingTest.php diff --git a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php b/core/modules/path/src/Form/DeleteForm.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Form/DeleteForm.php rename to core/modules/path/src/Form/DeleteForm.php diff --git a/core/modules/path/lib/Drupal/path/Plugin/DataType/PathItem.php b/core/modules/path/src/Plugin/DataType/PathItem.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Plugin/DataType/PathItem.php rename to core/modules/path/src/Plugin/DataType/PathItem.php diff --git a/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php rename to core/modules/path/src/Tests/PathAliasTest.php diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/src/Tests/PathLanguageTest.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php rename to core/modules/path/src/Tests/PathLanguageTest.php diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php b/core/modules/path/src/Tests/PathLanguageUiTest.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php rename to core/modules/path/src/Tests/PathLanguageUiTest.php diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/src/Tests/PathTaxonomyTermTest.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php rename to core/modules/path/src/Tests/PathTaxonomyTermTest.php diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTestBase.php b/core/modules/path/src/Tests/PathTestBase.php similarity index 100% rename from core/modules/path/lib/Drupal/path/Tests/PathTestBase.php rename to core/modules/path/src/Tests/PathTestBase.php diff --git a/core/modules/php/lib/Drupal/php/Plugin/Condition/Php.php b/core/modules/php/src/Plugin/Condition/Php.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Plugin/Condition/Php.php rename to core/modules/php/src/Plugin/Condition/Php.php diff --git a/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php b/core/modules/php/src/Plugin/Filter/Php.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php rename to core/modules/php/src/Plugin/Filter/Php.php diff --git a/core/modules/php/lib/Drupal/php/Plugin/views/argument_default/Php.php b/core/modules/php/src/Plugin/views/argument_default/Php.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Plugin/views/argument_default/Php.php rename to core/modules/php/src/Plugin/views/argument_default/Php.php diff --git a/core/modules/php/lib/Drupal/php/Plugin/views/argument_validator/Php.php b/core/modules/php/src/Plugin/views/argument_validator/Php.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Plugin/views/argument_validator/Php.php rename to core/modules/php/src/Plugin/views/argument_validator/Php.php diff --git a/core/modules/php/lib/Drupal/php/Tests/Condition/PhpConditionTest.php b/core/modules/php/src/Tests/Condition/PhpConditionTest.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Tests/Condition/PhpConditionTest.php rename to core/modules/php/src/Tests/Condition/PhpConditionTest.php diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php b/core/modules/php/src/Tests/PhpAccessTest.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php rename to core/modules/php/src/Tests/PhpAccessTest.php diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php b/core/modules/php/src/Tests/PhpFilterTest.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php rename to core/modules/php/src/Tests/PhpFilterTest.php diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php b/core/modules/php/src/Tests/PhpTestBase.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php rename to core/modules/php/src/Tests/PhpTestBase.php diff --git a/core/modules/php/lib/Drupal/php/Tests/Plugin/views/PhpArgumentValidatorTest.php b/core/modules/php/src/Tests/Plugin/views/PhpArgumentValidatorTest.php similarity index 100% rename from core/modules/php/lib/Drupal/php/Tests/Plugin/views/PhpArgumentValidatorTest.php rename to core/modules/php/src/Tests/Plugin/views/PhpArgumentValidatorTest.php diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/src/Entity/PictureMapping.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php rename to core/modules/picture/src/Entity/PictureMapping.php diff --git a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php b/core/modules/picture/src/Form/PictureMappingDeleteForm.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php rename to core/modules/picture/src/Form/PictureMappingDeleteForm.php diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingAccessController.php b/core/modules/picture/src/PictureMappingAccessController.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/PictureMappingAccessController.php rename to core/modules/picture/src/PictureMappingAccessController.php diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php b/core/modules/picture/src/PictureMappingFormController.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php rename to core/modules/picture/src/PictureMappingFormController.php diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php b/core/modules/picture/src/PictureMappingInterface.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php rename to core/modules/picture/src/PictureMappingInterface.php diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingListController.php b/core/modules/picture/src/PictureMappingListController.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/PictureMappingListController.php rename to core/modules/picture/src/PictureMappingListController.php diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php b/core/modules/picture/src/Plugin/field/formatter/PictureFormatter.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php rename to core/modules/picture/src/Plugin/field/formatter/PictureFormatter.php diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php b/core/modules/picture/src/Tests/PictureAdminUITest.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php rename to core/modules/picture/src/Tests/PictureAdminUITest.php diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php b/core/modules/picture/src/Tests/PictureFieldDisplayTest.php similarity index 100% rename from core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php rename to core/modules/picture/src/Tests/PictureFieldDisplayTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/CommonDataConverter.php b/core/modules/rdf/src/CommonDataConverter.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/CommonDataConverter.php rename to core/modules/rdf/src/CommonDataConverter.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php b/core/modules/rdf/src/Entity/RdfMapping.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php rename to core/modules/rdf/src/Entity/RdfMapping.php diff --git a/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php b/core/modules/rdf/src/RdfMappingInterface.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php rename to core/modules/rdf/src/RdfMappingInterface.php diff --git a/core/modules/rdf/lib/Drupal/rdf/SchemaOrgDataConverter.php b/core/modules/rdf/src/SchemaOrgDataConverter.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/SchemaOrgDataConverter.php rename to core/modules/rdf/src/SchemaOrgDataConverter.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/src/Tests/CommentAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php rename to core/modules/rdf/src/Tests/CommentAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php b/core/modules/rdf/src/Tests/CrudTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php rename to core/modules/rdf/src/Tests/CrudTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php rename to core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/FileFieldAttributesTest.php b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/FileFieldAttributesTest.php rename to core/modules/rdf/src/Tests/FileFieldAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php b/core/modules/rdf/src/Tests/GetNamespacesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php rename to core/modules/rdf/src/Tests/GetNamespacesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php rename to core/modules/rdf/src/Tests/GetRdfNamespacesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/ImageFieldAttributesTest.php rename to core/modules/rdf/src/Tests/ImageFieldAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/NodeAttributesTest.php b/core/modules/rdf/src/Tests/NodeAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/NodeAttributesTest.php rename to core/modules/rdf/src/Tests/NodeAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfMappingUpgradePathTest.php b/core/modules/rdf/src/Tests/RdfMappingUpgradePathTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfMappingUpgradePathTest.php rename to core/modules/rdf/src/Tests/RdfMappingUpgradePathTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaAttributesTest.php b/core/modules/rdf/src/Tests/RdfaAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfaAttributesTest.php rename to core/modules/rdf/src/Tests/RdfaAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php rename to core/modules/rdf/src/Tests/StandardProfileTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyAttributesTest.php b/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyAttributesTest.php rename to core/modules/rdf/src/Tests/TaxonomyAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php b/core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php rename to core/modules/rdf/src/Tests/TaxonomyTermFieldAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php b/core/modules/rdf/src/Tests/TrackerAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php rename to core/modules/rdf/src/Tests/TrackerAttributesTest.php diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php b/core/modules/rdf/src/Tests/UserAttributesTest.php similarity index 100% rename from core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php rename to core/modules/rdf/src/Tests/UserAttributesTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php b/core/modules/rest/src/Access/CSRFAccessCheck.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php rename to core/modules/rest/src/Access/CSRFAccessCheck.php diff --git a/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php b/core/modules/rest/src/EventSubscriber/RouteSubscriber.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php rename to core/modules/rest/src/EventSubscriber/RouteSubscriber.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/LinkManager.php b/core/modules/rest/src/LinkManager/LinkManager.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/LinkManager.php rename to core/modules/rest/src/LinkManager/LinkManager.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/LinkManagerInterface.php b/core/modules/rest/src/LinkManager/LinkManagerInterface.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/LinkManagerInterface.php rename to core/modules/rest/src/LinkManager/LinkManagerInterface.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php b/core/modules/rest/src/LinkManager/RelationLinkManager.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php rename to core/modules/rest/src/LinkManager/RelationLinkManager.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManagerInterface.php b/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManagerInterface.php rename to core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php b/core/modules/rest/src/LinkManager/TypeLinkManager.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php rename to core/modules/rest/src/LinkManager/TypeLinkManager.php diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php b/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php rename to core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php b/core/modules/rest/src/Plugin/Derivative/EntityDerivative.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php rename to core/modules/rest/src/Plugin/Derivative/EntityDerivative.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php b/core/modules/rest/src/Plugin/ResourceBase.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php rename to core/modules/rest/src/Plugin/ResourceBase.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceInterface.php b/core/modules/rest/src/Plugin/ResourceInterface.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/ResourceInterface.php rename to core/modules/rest/src/Plugin/ResourceInterface.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php similarity index 96% rename from core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php rename to core/modules/rest/src/Plugin/Type/ResourcePluginManager.php index 0ad6b0f..948cad5 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php +++ b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php @@ -32,7 +32,7 @@ class ResourcePluginManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - parent::__construct('Plugin/rest/resource', $namespaces); + parent::__construct($namespaces, 'Plugin\rest\resource'); $this->setCacheBackend($cache_backend, $language_manager, 'rest_plugins'); $this->alterInfo($module_handler, 'rest_resource'); diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php b/core/modules/rest/src/Plugin/rest/resource/DBLogResource.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php rename to core/modules/rest/src/Plugin/rest/resource/DBLogResource.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php rename to core/modules/rest/src/Plugin/rest/resource/EntityResource.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php rename to core/modules/rest/src/Plugin/views/display/RestExport.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php b/core/modules/rest/src/Plugin/views/row/DataEntityRow.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php rename to core/modules/rest/src/Plugin/views/row/DataEntityRow.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php b/core/modules/rest/src/Plugin/views/row/DataFieldRow.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php rename to core/modules/rest/src/Plugin/views/row/DataFieldRow.php diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php b/core/modules/rest/src/Plugin/views/style/Serializer.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php rename to core/modules/rest/src/Plugin/views/style/Serializer.php diff --git a/core/modules/rest/lib/Drupal/rest/RequestHandler.php b/core/modules/rest/src/RequestHandler.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/RequestHandler.php rename to core/modules/rest/src/RequestHandler.php diff --git a/core/modules/rest/lib/Drupal/rest/ResourceResponse.php b/core/modules/rest/src/ResourceResponse.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/ResourceResponse.php rename to core/modules/rest/src/ResourceResponse.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php b/core/modules/rest/src/Tests/AuthTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php rename to core/modules/rest/src/Tests/AuthTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/src/Tests/CreateTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php rename to core/modules/rest/src/Tests/CreateTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php b/core/modules/rest/src/Tests/DBLogTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php rename to core/modules/rest/src/Tests/DBLogTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/src/Tests/DeleteTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php rename to core/modules/rest/src/Tests/DeleteTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/NodeTest.php b/core/modules/rest/src/Tests/NodeTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/NodeTest.php rename to core/modules/rest/src/Tests/NodeTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php rename to core/modules/rest/src/Tests/RESTTestBase.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php b/core/modules/rest/src/Tests/ReadTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php rename to core/modules/rest/src/Tests/ReadTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php rename to core/modules/rest/src/Tests/UpdateTest.php diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php similarity index 100% rename from core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php rename to core/modules/rest/src/Tests/Views/StyleSerializerTest.php diff --git a/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php b/core/modules/rest/tests/src/CollectRoutesTest.php similarity index 100% rename from core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php rename to core/modules/rest/tests/src/CollectRoutesTest.php diff --git a/core/modules/search/lib/Drupal/search/Annotation/SearchPlugin.php b/core/modules/search/src/Annotation/SearchPlugin.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Annotation/SearchPlugin.php rename to core/modules/search/src/Annotation/SearchPlugin.php diff --git a/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php b/core/modules/search/src/Form/ReindexConfirm.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php rename to core/modules/search/src/Form/ReindexConfirm.php diff --git a/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php b/core/modules/search/src/Form/SearchBlockForm.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php rename to core/modules/search/src/Form/SearchBlockForm.php diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/src/Form/SearchSettingsForm.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php rename to core/modules/search/src/Form/SearchSettingsForm.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php b/core/modules/search/src/Plugin/Block/SearchBlock.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php rename to core/modules/search/src/Plugin/Block/SearchBlock.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchIndexingInterface.php b/core/modules/search/src/Plugin/SearchIndexingInterface.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/SearchIndexingInterface.php rename to core/modules/search/src/Plugin/SearchIndexingInterface.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchInterface.php b/core/modules/search/src/Plugin/SearchInterface.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/SearchInterface.php rename to core/modules/search/src/Plugin/SearchInterface.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php b/core/modules/search/src/Plugin/SearchPluginBase.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php rename to core/modules/search/src/Plugin/SearchPluginBase.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/src/Plugin/views/argument/Search.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php rename to core/modules/search/src/Plugin/views/argument/Search.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/src/Plugin/views/field/Score.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php rename to core/modules/search/src/Plugin/views/field/Score.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php rename to core/modules/search/src/Plugin/views/filter/Search.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php b/core/modules/search/src/Plugin/views/row/SearchRow.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php rename to core/modules/search/src/Plugin/views/row/SearchRow.php diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php b/core/modules/search/src/Plugin/views/sort/Score.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php rename to core/modules/search/src/Plugin/views/sort/Score.php diff --git a/core/modules/search/lib/Drupal/search/SearchPluginManager.php b/core/modules/search/src/SearchPluginManager.php similarity index 94% rename from core/modules/search/lib/Drupal/search/SearchPluginManager.php rename to core/modules/search/src/SearchPluginManager.php index 3821791..8bf6d92 100644 --- a/core/modules/search/lib/Drupal/search/SearchPluginManager.php +++ b/core/modules/search/src/SearchPluginManager.php @@ -28,8 +28,8 @@ class SearchPluginManager extends DefaultPluginManager { * {@inheritdoc} */ public function __construct(\Traversable $namespaces, ConfigFactory $config_factory) { - $annotation_namespaces = array('Drupal\search\Annotation' => $namespaces['Drupal\search']); - parent::__construct('Plugin/Search', $namespaces, $annotation_namespaces, 'Drupal\search\Annotation\SearchPlugin'); + parent::__construct($namespaces, 'Plugin\Search', 'Drupal\search\Annotation\SearchPlugin'); + $this->addAnnotationNamespace('Drupal\search\Annotation'); $this->configFactory = $config_factory; } diff --git a/core/modules/search/lib/Drupal/search/SearchQuery.php b/core/modules/search/src/SearchQuery.php similarity index 100% rename from core/modules/search/lib/Drupal/search/SearchQuery.php rename to core/modules/search/src/SearchQuery.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchAdvancedSearchFormTest.php b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchAdvancedSearchFormTest.php rename to core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php rename to core/modules/search/src/Tests/SearchBlockTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchCommentCountToggleTest.php b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchCommentCountToggleTest.php rename to core/modules/search/src/Tests/SearchCommentCountToggleTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php rename to core/modules/search/src/Tests/SearchCommentTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php rename to core/modules/search/src/Tests/SearchConfigSettingsFormTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchEmbedFormTest.php b/core/modules/search/src/Tests/SearchEmbedFormTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchEmbedFormTest.php rename to core/modules/search/src/Tests/SearchEmbedFormTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExactTest.php b/core/modules/search/src/Tests/SearchExactTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchExactTest.php rename to core/modules/search/src/Tests/SearchExactTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php b/core/modules/search/src/Tests/SearchExcerptTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php rename to core/modules/search/src/Tests/SearchExcerptTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchKeywordsConditionsTest.php b/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchKeywordsConditionsTest.php rename to core/modules/search/src/Tests/SearchKeywordsConditionsTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php b/core/modules/search/src/Tests/SearchLanguageTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php rename to core/modules/search/src/Tests/SearchLanguageTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchMatchTest.php b/core/modules/search/src/Tests/SearchMatchTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchMatchTest.php rename to core/modules/search/src/Tests/SearchMatchTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchMultilingualEntityTest.php rename to core/modules/search/src/Tests/SearchMultilingualEntityTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNodeAccessTest.php b/core/modules/search/src/Tests/SearchNodeAccessTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchNodeAccessTest.php rename to core/modules/search/src/Tests/SearchNodeAccessTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNumberMatchingTest.php b/core/modules/search/src/Tests/SearchNumberMatchingTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchNumberMatchingTest.php rename to core/modules/search/src/Tests/SearchNumberMatchingTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNumbersTest.php b/core/modules/search/src/Tests/SearchNumbersTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchNumbersTest.php rename to core/modules/search/src/Tests/SearchNumbersTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPageOverrideTest.php b/core/modules/search/src/Tests/SearchPageOverrideTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchPageOverrideTest.php rename to core/modules/search/src/Tests/SearchPageOverrideTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPageTextTest.php b/core/modules/search/src/Tests/SearchPageTextTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchPageTextTest.php rename to core/modules/search/src/Tests/SearchPageTextTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPreprocessLangcodeTest.php b/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchPreprocessLangcodeTest.php rename to core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php rename to core/modules/search/src/Tests/SearchRankingTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchSimplifyTest.php b/core/modules/search/src/Tests/SearchSimplifyTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchSimplifyTest.php rename to core/modules/search/src/Tests/SearchSimplifyTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchTestBase.php rename to core/modules/search/src/Tests/SearchTestBase.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchTokenizerTest.php b/core/modules/search/src/Tests/SearchTokenizerTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchTokenizerTest.php rename to core/modules/search/src/Tests/SearchTokenizerTest.php diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchUpgradePathTest.php b/core/modules/search/src/Tests/SearchUpgradePathTest.php similarity index 100% rename from core/modules/search/lib/Drupal/search/Tests/SearchUpgradePathTest.php rename to core/modules/search/src/Tests/SearchUpgradePathTest.php diff --git a/core/modules/search/lib/Drupal/search/ViewsSearchQuery.php b/core/modules/search/src/ViewsSearchQuery.php similarity index 100% rename from core/modules/search/lib/Drupal/search/ViewsSearchQuery.php rename to core/modules/search/src/ViewsSearchQuery.php diff --git a/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php similarity index 100% rename from core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php rename to core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Encoder/JsonEncoder.php b/core/modules/serialization/src/Encoder/JsonEncoder.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Encoder/JsonEncoder.php rename to core/modules/serialization/src/Encoder/JsonEncoder.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Encoder/XmlEncoder.php b/core/modules/serialization/src/Encoder/XmlEncoder.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Encoder/XmlEncoder.php rename to core/modules/serialization/src/Encoder/XmlEncoder.php diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/ChainEntityResolver.php b/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/ChainEntityResolver.php rename to core/modules/serialization/src/EntityResolver/ChainEntityResolver.php diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/EntityResolverInterface.php b/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/EntityResolverInterface.php rename to core/modules/serialization/src/EntityResolver/EntityResolverInterface.php diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidReferenceInterface.php b/core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidReferenceInterface.php rename to core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidResolver.php b/core/modules/serialization/src/EntityResolver/UuidResolver.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidResolver.php rename to core/modules/serialization/src/EntityResolver/UuidResolver.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/ComplexDataNormalizer.php b/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/ComplexDataNormalizer.php rename to core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/ListNormalizer.php b/core/modules/serialization/src/Normalizer/ListNormalizer.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/ListNormalizer.php rename to core/modules/serialization/src/Normalizer/ListNormalizer.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/NormalizerBase.php b/core/modules/serialization/src/Normalizer/NormalizerBase.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/NormalizerBase.php rename to core/modules/serialization/src/Normalizer/NormalizerBase.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/TypedDataNormalizer.php b/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/TypedDataNormalizer.php rename to core/modules/serialization/src/Normalizer/TypedDataNormalizer.php diff --git a/core/modules/serialization/lib/Drupal/serialization/RegisterEntityResolversCompilerPass.php b/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/RegisterEntityResolversCompilerPass.php rename to core/modules/serialization/src/RegisterEntityResolversCompilerPass.php diff --git a/core/modules/serialization/lib/Drupal/serialization/RegisterSerializationClassesCompilerPass.php b/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/RegisterSerializationClassesCompilerPass.php rename to core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php diff --git a/core/modules/serialization/lib/Drupal/serialization/SerializationServiceProvider.php b/core/modules/serialization/src/SerializationServiceProvider.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/SerializationServiceProvider.php rename to core/modules/serialization/src/SerializationServiceProvider.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php b/core/modules/serialization/src/Tests/EntityResolverTest.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php rename to core/modules/serialization/src/Tests/EntityResolverTest.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php rename to core/modules/serialization/src/Tests/EntitySerializationTest.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php b/core/modules/serialization/src/Tests/NormalizerTestBase.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php rename to core/modules/serialization/src/Tests/NormalizerTestBase.php diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php b/core/modules/serialization/src/Tests/SerializationTest.php similarity index 100% rename from core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php rename to core/modules/serialization/src/Tests/SerializationTest.php diff --git a/core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestEncoder.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php similarity index 100% rename from core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestEncoder.php rename to core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php diff --git a/core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestNormalizer.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php similarity index 100% rename from core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestNormalizer.php rename to core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php b/core/modules/shortcut/src/Access/LinkDeleteAccessCheck.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php rename to core/modules/shortcut/src/Access/LinkDeleteAccessCheck.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php b/core/modules/shortcut/src/Controller/ShortcutSetController.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php rename to core/modules/shortcut/src/Controller/ShortcutSetController.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php rename to core/modules/shortcut/src/Entity/ShortcutSet.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php b/core/modules/shortcut/src/Form/LinkDelete.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php rename to core/modules/shortcut/src/Form/LinkDelete.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php b/core/modules/shortcut/src/Form/SetCustomize.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php rename to core/modules/shortcut/src/Form/SetCustomize.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php rename to core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php rename to core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php b/core/modules/shortcut/src/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php rename to core/modules/shortcut/src/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php b/core/modules/shortcut/src/ShortcutSetAccessController.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php rename to core/modules/shortcut/src/ShortcutSetAccessController.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetFormController.php b/core/modules/shortcut/src/ShortcutSetFormController.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetFormController.php rename to core/modules/shortcut/src/ShortcutSetFormController.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php b/core/modules/shortcut/src/ShortcutSetInterface.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php rename to core/modules/shortcut/src/ShortcutSetInterface.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetListController.php b/core/modules/shortcut/src/ShortcutSetListController.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetListController.php rename to core/modules/shortcut/src/ShortcutSetListController.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageController.php b/core/modules/shortcut/src/ShortcutSetStorageController.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageController.php rename to core/modules/shortcut/src/ShortcutSetStorageController.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php b/core/modules/shortcut/src/ShortcutSetStorageControllerInterface.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php rename to core/modules/shortcut/src/ShortcutSetStorageControllerInterface.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php rename to core/modules/shortcut/src/Tests/ShortcutLinksTest.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php rename to core/modules/shortcut/src/Tests/ShortcutSetsTest.php diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php b/core/modules/shortcut/src/Tests/ShortcutTestBase.php similarity index 100% rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php rename to core/modules/shortcut/src/Tests/ShortcutTestBase.php diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 8d441f4..5ab35db 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -454,21 +454,29 @@ function simpletest_test_get_all() { $all_data = $module_data + system_rebuild_theme_data(); $all_data += drupal_system_listing('/\.profile$/', 'profiles', 'name'); foreach ($all_data as $name => $data) { - // Build directory in which the test files would reside. - $tests_dir = DRUPAL_ROOT . '/' . dirname($data->uri) . '/lib/Drupal/' . $name . '/Tests'; + $extension_dir = DRUPAL_ROOT . '/' . dirname($data->uri); + + // Build directories in which the test files would reside. + $tests_dirs = array(); + $tests_dirs[] = $extension_dir . '/lib/Drupal/' . $name . '/Tests'; + $tests_dirs[] = $extension_dir . '/lib/Tests'; + $tests_dirs[] = $extension_dir . '/src/Tests'; + $tests_dirs[] = $extension_dir . '/tests/Drupal/' . $name . '/Tests'; + $tests_dirs[] = $extension_dir . '/tests/lib'; + $tests_dirs[] = $extension_dir . '/tests/src'; + + $namespace = 'Drupal\\' . $name . '\Tests\\'; + // Scan it for test files if it exists. - if (is_dir($tests_dir)) { - $files = file_scan_directory($tests_dir, '/.*\.php/'); - if (!empty($files)) { - $basedir = DRUPAL_ROOT . '/' . dirname($data->uri) . '/lib/'; - foreach ($files as $file) { - // Convert the file name into the namespaced class name. - $replacements = array( - '/' => '\\', - $basedir => '', - '.php' => '', - ); - $classes[] = strtr($file->uri, $replacements); + foreach ($tests_dirs as $tests_dir) { + if (is_dir($tests_dir)) { + $files = file_scan_directory($tests_dir, '/.*\.php/'); + if (!empty($files)) { + $strlen = strlen($tests_dir) + 1; + // Convert the file names into the namespaced class names. + foreach ($files as $file) { + $classes[] = $namespace . str_replace('/', '\\', substr($file->uri, $strlen, -4)); + } } } } @@ -526,8 +534,15 @@ function simpletest_classloader_register() { foreach ($types as $type => $info) { $matches = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.' . $info['extension'] . '$/', $info['dir']); foreach ($matches as $name => $file) { + // @todo Register PSR-4 namespace directories, once our classloader supports it. + // See https://drupal.org/node/2058867 drupal_classloader_register($name, dirname($file->uri)); - $classloader->add('Drupal\\' . $name . '\\Tests', DRUPAL_ROOT . '/' . dirname($file->uri) . '/tests'); + $extension_dir = dirname($file->uri); + $dirs = array(); + $dirs[] = $extension_dir . '/tests/Drupal/' . $name . '/Tests'; + $dirs[] = $extension_dir . '/tests/lib'; + $dirs[] = $extension_dir . '/tests/src'; + $classloader->addPsr4('Drupal\\' . $name . '\\Tests\\', $dirs); // While being there, prime drupal_get_filename(). drupal_get_filename($type, $name, $file->uri); } diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/src/DrupalUnitTestBase.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php rename to core/modules/simpletest/src/DrupalUnitTestBase.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php rename to core/modules/simpletest/src/Form/SimpletestResultsForm.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php b/core/modules/simpletest/src/Form/SimpletestSettingsForm.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php rename to core/modules/simpletest/src/Form/SimpletestSettingsForm.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestTestForm.php rename to core/modules/simpletest/src/Form/SimpletestTestForm.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/src/TestBase.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/TestBase.php rename to core/modules/simpletest/src/TestBase.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestServiceProvider.php b/core/modules/simpletest/src/TestServiceProvider.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/TestServiceProvider.php rename to core/modules/simpletest/src/TestServiceProvider.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/BrokenSetUpTest.php b/core/modules/simpletest/src/Tests/BrokenSetUpTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/BrokenSetUpTest.php rename to core/modules/simpletest/src/Tests/BrokenSetUpTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/BrowserTest.php b/core/modules/simpletest/src/Tests/BrowserTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/BrowserTest.php rename to core/modules/simpletest/src/Tests/BrowserTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php b/core/modules/simpletest/src/Tests/DrupalUnitTestBaseTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php rename to core/modules/simpletest/src/Tests/DrupalUnitTestBaseTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/FolderTest.php b/core/modules/simpletest/src/Tests/FolderTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/FolderTest.php rename to core/modules/simpletest/src/Tests/FolderTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/InstallationProfileModuleTestsTest.php rename to core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MailCaptureTest.php b/core/modules/simpletest/src/Tests/MailCaptureTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MailCaptureTest.php rename to core/modules/simpletest/src/Tests/MailCaptureTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingCheckedRequirementsTest.php b/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingCheckedRequirementsTest.php rename to core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingDependentModuleUnitTest.php b/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingDependentModuleUnitTest.php rename to core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/OtherInstallationProfileModuleTestsTest.php b/core/modules/simpletest/src/Tests/OtherInstallationProfileModuleTestsTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/OtherInstallationProfileModuleTestsTest.php rename to core/modules/simpletest/src/Tests/OtherInstallationProfileModuleTestsTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php rename to core/modules/simpletest/src/Tests/SimpleTestTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/UserHelpersTest.php b/core/modules/simpletest/src/Tests/UserHelpersTest.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/UserHelpersTest.php rename to core/modules/simpletest/src/Tests/UserHelpersTest.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php b/core/modules/simpletest/src/UnitTestBase.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php rename to core/modules/simpletest/src/UnitTestBase.php diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php similarity index 100% rename from core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php rename to core/modules/simpletest/src/WebTestBase.php diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitAutoloaderTest.php b/core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php similarity index 100% rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitAutoloaderTest.php rename to core/modules/simpletest/tests/src/PhpUnitAutoloaderTest.php diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitErrorTest.php b/core/modules/simpletest/tests/src/PhpUnitErrorTest.php similarity index 100% rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitErrorTest.php rename to core/modules/simpletest/tests/src/PhpUnitErrorTest.php diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php b/core/modules/simpletest/tests/src/TestBaseTest.php similarity index 100% rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php rename to core/modules/simpletest/tests/src/TestBaseTest.php diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml b/core/modules/simpletest/tests/src/phpunit_error.xml similarity index 100% rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml rename to core/modules/simpletest/tests/src/phpunit_error.xml diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php rename to core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php diff --git a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php b/core/modules/statistics/src/StatisticsSettingsForm.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php rename to core/modules/statistics/src/StatisticsSettingsForm.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php rename to core/modules/statistics/src/Tests/StatisticsAdminTest.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php b/core/modules/statistics/src/Tests/StatisticsLoggingTest.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php rename to core/modules/statistics/src/Tests/StatisticsLoggingTest.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php b/core/modules/statistics/src/Tests/StatisticsReportsTest.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php rename to core/modules/statistics/src/Tests/StatisticsReportsTest.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTestBase.php b/core/modules/statistics/src/Tests/StatisticsTestBase.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTestBase.php rename to core/modules/statistics/src/Tests/StatisticsTestBase.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php rename to core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php b/core/modules/statistics/src/Tests/Views/IntegrationTest.php similarity index 100% rename from core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php rename to core/modules/statistics/src/Tests/Views/IntegrationTest.php diff --git a/core/modules/statistics/statistics.php b/core/modules/statistics/statistics.php index ed132e8..22acde2 100644 --- a/core/modules/statistics/statistics.php +++ b/core/modules/statistics/statistics.php @@ -9,7 +9,7 @@ chdir('../../..'); // Load the Drupal bootstrap. -require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php'; +require_once dirname(dirname(__DIR__)) . '/autoload.php'; require_once dirname(dirname(__DIR__)) . '/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES); diff --git a/core/modules/syslog/lib/Drupal/syslog/Tests/SyslogTest.php b/core/modules/syslog/src/Tests/SyslogTest.php similarity index 100% rename from core/modules/syslog/lib/Drupal/syslog/Tests/SyslogTest.php rename to core/modules/syslog/src/Tests/SyslogTest.php diff --git a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php b/core/modules/system/src/Access/CronAccessCheck.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php rename to core/modules/system/src/Access/CronAccessCheck.php diff --git a/core/modules/system/lib/Drupal/system/ActionConfigEntityInterface.php b/core/modules/system/src/ActionConfigEntityInterface.php similarity index 100% rename from core/modules/system/lib/Drupal/system/ActionConfigEntityInterface.php rename to core/modules/system/src/ActionConfigEntityInterface.php diff --git a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php b/core/modules/system/src/Annotation/ImageToolkit.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php rename to core/modules/system/src/Annotation/ImageToolkit.php diff --git a/core/modules/system/lib/Drupal/system/Controller/AdminController.php b/core/modules/system/src/Controller/AdminController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/AdminController.php rename to core/modules/system/src/Controller/AdminController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php b/core/modules/system/src/Controller/DateFormatLanguageController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php rename to core/modules/system/src/Controller/DateFormatLanguageController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php b/core/modules/system/src/Controller/FormAjaxController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php rename to core/modules/system/src/Controller/FormAjaxController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/SystemController.php rename to core/modules/system/src/Controller/SystemController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php b/core/modules/system/src/Controller/SystemInfoController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php rename to core/modules/system/src/Controller/SystemInfoController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php b/core/modules/system/src/Controller/ThemeController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/ThemeController.php rename to core/modules/system/src/Controller/ThemeController.php diff --git a/core/modules/system/lib/Drupal/system/Controller/TimezoneController.php b/core/modules/system/src/Controller/TimezoneController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Controller/TimezoneController.php rename to core/modules/system/src/Controller/TimezoneController.php diff --git a/core/modules/system/lib/Drupal/system/CronController.php b/core/modules/system/src/CronController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/CronController.php rename to core/modules/system/src/CronController.php diff --git a/core/modules/system/lib/Drupal/system/DateFormatAccessController.php b/core/modules/system/src/DateFormatAccessController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/DateFormatAccessController.php rename to core/modules/system/src/DateFormatAccessController.php diff --git a/core/modules/system/lib/Drupal/system/DateFormatInterface.php b/core/modules/system/src/DateFormatInterface.php similarity index 100% rename from core/modules/system/lib/Drupal/system/DateFormatInterface.php rename to core/modules/system/src/DateFormatInterface.php diff --git a/core/modules/system/lib/Drupal/system/DateFormatListController.php b/core/modules/system/src/DateFormatListController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/DateFormatListController.php rename to core/modules/system/src/DateFormatListController.php diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/src/Entity/Action.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Entity/Action.php rename to core/modules/system/src/Entity/Action.php diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/src/Entity/DateFormat.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Entity/DateFormat.php rename to core/modules/system/src/Entity/DateFormat.php diff --git a/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/src/Entity/Menu.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Entity/Menu.php rename to core/modules/system/src/Entity/Menu.php diff --git a/core/modules/system/lib/Drupal/system/FileDownloadController.php b/core/modules/system/src/FileDownloadController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/FileDownloadController.php rename to core/modules/system/src/FileDownloadController.php diff --git a/core/modules/system/lib/Drupal/system/Form/CronForm.php b/core/modules/system/src/Form/CronForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/CronForm.php rename to core/modules/system/src/Form/CronForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatAddForm.php b/core/modules/system/src/Form/DateFormatAddForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/DateFormatAddForm.php rename to core/modules/system/src/Form/DateFormatAddForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/src/Form/DateFormatDeleteForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php rename to core/modules/system/src/Form/DateFormatDeleteForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatEditForm.php b/core/modules/system/src/Form/DateFormatEditForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/DateFormatEditForm.php rename to core/modules/system/src/Form/DateFormatEditForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php rename to core/modules/system/src/Form/DateFormatFormBase.php diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/src/Form/DateFormatLocalizeResetForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php rename to core/modules/system/src/Form/DateFormatLocalizeResetForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/FileSystemForm.php rename to core/modules/system/src/Form/FileSystemForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php b/core/modules/system/src/Form/ImageToolkitForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php rename to core/modules/system/src/Form/ImageToolkitForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/LoggingForm.php b/core/modules/system/src/Form/LoggingForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/LoggingForm.php rename to core/modules/system/src/Form/LoggingForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php rename to core/modules/system/src/Form/ModulesListConfirmForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ModulesListForm.php rename to core/modules/system/src/Form/ModulesListForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php rename to core/modules/system/src/Form/ModulesUninstallConfirmForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php rename to core/modules/system/src/Form/ModulesUninstallForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php b/core/modules/system/src/Form/PerformanceForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/PerformanceForm.php rename to core/modules/system/src/Form/PerformanceForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/src/Form/RegionalForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/RegionalForm.php rename to core/modules/system/src/Form/RegionalForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php b/core/modules/system/src/Form/RssFeedsForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php rename to core/modules/system/src/Form/RssFeedsForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php b/core/modules/system/src/Form/SiteInformationForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php rename to core/modules/system/src/Form/SiteInformationForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php b/core/modules/system/src/Form/SiteMaintenanceModeForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php rename to core/modules/system/src/Form/SiteMaintenanceModeForm.php diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/src/Form/ThemeSettingsForm.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php rename to core/modules/system/src/Form/ThemeSettingsForm.php diff --git a/core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php b/core/modules/system/src/LegacyBreadcrumbBuilder.php similarity index 100% rename from core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php rename to core/modules/system/src/LegacyBreadcrumbBuilder.php diff --git a/core/modules/system/lib/Drupal/system/MachineNameController.php b/core/modules/system/src/MachineNameController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/MachineNameController.php rename to core/modules/system/src/MachineNameController.php diff --git a/core/modules/system/lib/Drupal/system/MenuAccessController.php b/core/modules/system/src/MenuAccessController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/MenuAccessController.php rename to core/modules/system/src/MenuAccessController.php diff --git a/core/modules/system/lib/Drupal/system/MenuInterface.php b/core/modules/system/src/MenuInterface.php similarity index 100% rename from core/modules/system/lib/Drupal/system/MenuInterface.php rename to core/modules/system/src/MenuInterface.php diff --git a/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php b/core/modules/system/src/PathProcessor/PathProcessorFiles.php similarity index 100% rename from core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php rename to core/modules/system/src/PathProcessor/PathProcessorFiles.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php b/core/modules/system/src/Plugin/Archiver/Tar.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php rename to core/modules/system/src/Plugin/Archiver/Tar.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php b/core/modules/system/src/Plugin/Archiver/Zip.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php rename to core/modules/system/src/Plugin/Archiver/Zip.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php rename to core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/src/Plugin/Block/SystemHelpBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php rename to core/modules/system/src/Plugin/Block/SystemHelpBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php b/core/modules/system/src/Plugin/Block/SystemMainBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php rename to core/modules/system/src/Plugin/Block/SystemMainBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php rename to core/modules/system/src/Plugin/Block/SystemMenuBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php rename to core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/Derivative/SystemMenuBlock.php b/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/Derivative/SystemMenuBlock.php rename to core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php rename to core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php b/core/modules/system/src/Plugin/ImageToolkitInterface.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php rename to core/modules/system/src/Plugin/ImageToolkitInterface.php diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php b/core/modules/system/src/Plugin/ImageToolkitManager.php similarity index 91% rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php rename to core/modules/system/src/Plugin/ImageToolkitManager.php index dc22c51..6188bef 100644 --- a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php +++ b/core/modules/system/src/Plugin/ImageToolkitManager.php @@ -28,8 +28,8 @@ class ImageToolkitManager extends DefaultPluginManager { * The language manager. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager) { - $annotation_namespaces = array('Drupal\system\Annotation' => $namespaces['Drupal\system']); - parent::__construct('Plugin/ImageToolkit', $namespaces, $annotation_namespaces, 'Drupal\system\Annotation\ImageToolkit'); + parent::__construct($namespaces, 'Plugin\ImageToolkit', 'Drupal\system\Annotation\ImageToolkit'); + $this->addAnnotationNamespace('Drupal\system\Annotation'); $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit'); } diff --git a/core/modules/system/src/Plugin/Type/PluginUIManager.php b/core/modules/system/src/Plugin/Type/PluginUIManager.php new file mode 100644 index 0000000..971d47d --- /dev/null +++ b/core/modules/system/src/Plugin/Type/PluginUIManager.php @@ -0,0 +1,51 @@ +discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\PluginUI'); + $this->discovery = new DerivativeDiscoveryDecorator($this->discovery); + $this->discovery = new AlterDecorator($this->discovery, 'plugin_ui'); + $this->discovery = new CacheDecorator($this->discovery, 'plugin_ui'); + $this->factory = new DefaultFactory($this->discovery); + } + + /** + * Overrides \Drupal\Component\Plugin\PluginManagerBase::processDefinition(). + */ + public function processDefinition(&$definition, $plugin_id) { + $definition += array( + 'default_task' => TRUE, + 'task_title' => t('View'), + 'task_suffix' => 'view', + 'access_callback' => 'user_access', + ); + } + +} diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php b/core/modules/system/src/Plugin/views/field/BulkFormBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php rename to core/modules/system/src/Plugin/views/field/BulkFormBase.php diff --git a/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php b/core/modules/system/src/Routing/RouteSubscriber.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php rename to core/modules/system/src/Routing/RouteSubscriber.php diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/modules/system/src/SystemConfigFormBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/SystemConfigFormBase.php rename to core/modules/system/src/SystemConfigFormBase.php diff --git a/core/modules/system/lib/Drupal/system/SystemConfigSubscriber.php b/core/modules/system/src/SystemConfigSubscriber.php similarity index 100% rename from core/modules/system/lib/Drupal/system/SystemConfigSubscriber.php rename to core/modules/system/src/SystemConfigSubscriber.php diff --git a/core/modules/system/lib/Drupal/system/SystemManager.php b/core/modules/system/src/SystemManager.php similarity index 100% rename from core/modules/system/lib/Drupal/system/SystemManager.php rename to core/modules/system/src/SystemManager.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php b/core/modules/system/src/Tests/Action/ActionUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php rename to core/modules/system/src/Tests/Action/ActionUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxCommandsUnitTest.php b/core/modules/system/src/Tests/Ajax/AjaxCommandsUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxCommandsUnitTest.php rename to core/modules/system/src/Tests/Ajax/AjaxCommandsUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php rename to core/modules/system/src/Tests/Ajax/AjaxTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php b/core/modules/system/src/Tests/Ajax/CommandsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php rename to core/modules/system/src/Tests/Ajax/CommandsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php rename to core/modules/system/src/Tests/Ajax/DialogTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php b/core/modules/system/src/Tests/Ajax/ElementValidationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php rename to core/modules/system/src/Tests/Ajax/ElementValidationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php b/core/modules/system/src/Tests/Ajax/FormValuesTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php rename to core/modules/system/src/Tests/Ajax/FormValuesTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php rename to core/modules/system/src/Tests/Ajax/FrameworkTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php rename to core/modules/system/src/Tests/Ajax/MultiFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Authentication/HttpBasicTest.php b/core/modules/system/src/Tests/Authentication/HttpBasicTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Authentication/HttpBasicTest.php rename to core/modules/system/src/Tests/Authentication/HttpBasicTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php b/core/modules/system/src/Tests/Batch/PageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php rename to core/modules/system/src/Tests/Batch/PageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php b/core/modules/system/src/Tests/Batch/ProcessingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php rename to core/modules/system/src/Tests/Batch/ProcessingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php rename to core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php b/core/modules/system/src/Tests/Bootstrap/MiscUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php rename to core/modules/system/src/Tests/Bootstrap/MiscUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php b/core/modules/system/src/Tests/Bootstrap/OverrideServerVariablesUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php rename to core/modules/system/src/Tests/Bootstrap/OverrideServerVariablesUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php b/core/modules/system/src/Tests/Bootstrap/PageCacheTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php rename to core/modules/system/src/Tests/Bootstrap/PageCacheTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php rename to core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php b/core/modules/system/src/Tests/Bootstrap/VariableTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php rename to core/modules/system/src/Tests/Bootstrap/VariableTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/BackendChainUnitTest.php b/core/modules/system/src/Tests/Cache/BackendChainUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/BackendChainUnitTest.php rename to core/modules/system/src/Tests/Cache/BackendChainUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php b/core/modules/system/src/Tests/Cache/CacheTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php rename to core/modules/system/src/Tests/Cache/CacheTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php b/core/modules/system/src/Tests/Cache/ClearTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php rename to core/modules/system/src/Tests/Cache/ClearTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/DatabaseBackendUnitTest.php b/core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/DatabaseBackendUnitTest.php rename to core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php rename to core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/MemoryBackendUnitTest.php b/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Cache/MemoryBackendUnitTest.php rename to core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php rename to core/modules/system/src/Tests/Common/AddFeedTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php b/core/modules/system/src/Tests/Common/AlterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php rename to core/modules/system/src/Tests/Common/AlterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php rename to core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/src/Tests/Common/FormatDateTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php rename to core/modules/system/src/Tests/Common/FormatDateTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php b/core/modules/system/src/Tests/Common/HtmlIdentifierUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php rename to core/modules/system/src/Tests/Common/HtmlIdentifierUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/src/Tests/Common/JavaScriptTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php rename to core/modules/system/src/Tests/Common/JavaScriptTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php b/core/modules/system/src/Tests/Common/ParseInfoFileUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php rename to core/modules/system/src/Tests/Common/ParseInfoFileUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php b/core/modules/system/src/Tests/Common/RegionContentTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php rename to core/modules/system/src/Tests/Common/RegionContentTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php rename to core/modules/system/src/Tests/Common/RenderElementTypesTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/src/Tests/Common/RenderTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php rename to core/modules/system/src/Tests/Common/RenderTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php rename to core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php b/core/modules/system/src/Tests/Common/SizeUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php rename to core/modules/system/src/Tests/Common/SizeUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php b/core/modules/system/src/Tests/Common/SystemListingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php rename to core/modules/system/src/Tests/Common/SystemListingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php rename to core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php rename to core/modules/system/src/Tests/Common/UrlTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ValidNumberStepUnitTest.php b/core/modules/system/src/Tests/Common/ValidNumberStepUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/ValidNumberStepUnitTest.php rename to core/modules/system/src/Tests/Common/ValidNumberStepUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php b/core/modules/system/src/Tests/Common/WriteRecordTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php rename to core/modules/system/src/Tests/Common/WriteRecordTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php b/core/modules/system/src/Tests/Common/XssUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php rename to core/modules/system/src/Tests/Common/XssUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Condition/ConditionFormTest.php b/core/modules/system/src/Tests/Condition/ConditionFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Condition/ConditionFormTest.php rename to core/modules/system/src/Tests/Condition/ConditionFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php b/core/modules/system/src/Tests/Database/AlterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php rename to core/modules/system/src/Tests/Database/AlterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php b/core/modules/system/src/Tests/Database/BasicSyntaxTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php rename to core/modules/system/src/Tests/Database/BasicSyntaxTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php b/core/modules/system/src/Tests/Database/CaseSensitivityTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php rename to core/modules/system/src/Tests/Database/CaseSensitivityTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php b/core/modules/system/src/Tests/Database/ConnectionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php rename to core/modules/system/src/Tests/Database/ConnectionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionUnitTest.php b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/ConnectionUnitTest.php rename to core/modules/system/src/Tests/Database/ConnectionUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseExceptionWrapperTest.php b/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseExceptionWrapperTest.php rename to core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php b/core/modules/system/src/Tests/Database/DatabaseTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php rename to core/modules/system/src/Tests/Database/DatabaseTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseWebTestBase.php b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseWebTestBase.php rename to core/modules/system/src/Tests/Database/DatabaseWebTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php rename to core/modules/system/src/Tests/Database/DeleteTruncateTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php b/core/modules/system/src/Tests/Database/FakeRecord.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php rename to core/modules/system/src/Tests/Database/FakeRecord.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php b/core/modules/system/src/Tests/Database/FetchTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php rename to core/modules/system/src/Tests/Database/FetchTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php b/core/modules/system/src/Tests/Database/InsertDefaultsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php rename to core/modules/system/src/Tests/Database/InsertDefaultsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/src/Tests/Database/InsertLobTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php rename to core/modules/system/src/Tests/Database/InsertLobTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php b/core/modules/system/src/Tests/Database/InsertTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php rename to core/modules/system/src/Tests/Database/InsertTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php b/core/modules/system/src/Tests/Database/InvalidDataTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php rename to core/modules/system/src/Tests/Database/InvalidDataTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php b/core/modules/system/src/Tests/Database/LoggingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php rename to core/modules/system/src/Tests/Database/LoggingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php b/core/modules/system/src/Tests/Database/MergeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php rename to core/modules/system/src/Tests/Database/MergeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php b/core/modules/system/src/Tests/Database/NextIdTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php rename to core/modules/system/src/Tests/Database/NextIdTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php b/core/modules/system/src/Tests/Database/QueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php rename to core/modules/system/src/Tests/Database/QueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php b/core/modules/system/src/Tests/Database/RangeQueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php rename to core/modules/system/src/Tests/Database/RangeQueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php b/core/modules/system/src/Tests/Database/RegressionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php rename to core/modules/system/src/Tests/Database/RegressionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SchemaTest.php rename to core/modules/system/src/Tests/Database/SchemaTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectCloneTest.php b/core/modules/system/src/Tests/Database/SelectCloneTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectCloneTest.php rename to core/modules/system/src/Tests/Database/SelectCloneTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php b/core/modules/system/src/Tests/Database/SelectComplexTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php rename to core/modules/system/src/Tests/Database/SelectComplexTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php b/core/modules/system/src/Tests/Database/SelectOrderedTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php rename to core/modules/system/src/Tests/Database/SelectOrderedTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php rename to core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php b/core/modules/system/src/Tests/Database/SelectSubqueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php rename to core/modules/system/src/Tests/Database/SelectSubqueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php rename to core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php b/core/modules/system/src/Tests/Database/SelectTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php rename to core/modules/system/src/Tests/Database/SelectTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php b/core/modules/system/src/Tests/Database/SerializeQueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php rename to core/modules/system/src/Tests/Database/SerializeQueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php b/core/modules/system/src/Tests/Database/TaggingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php rename to core/modules/system/src/Tests/Database/TaggingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php b/core/modules/system/src/Tests/Database/TemporaryQueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php rename to core/modules/system/src/Tests/Database/TemporaryQueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php b/core/modules/system/src/Tests/Database/TransactionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php rename to core/modules/system/src/Tests/Database/TransactionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php b/core/modules/system/src/Tests/Database/UpdateComplexTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php rename to core/modules/system/src/Tests/Database/UpdateComplexTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/src/Tests/Database/UpdateLobTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php rename to core/modules/system/src/Tests/Database/UpdateLobTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php b/core/modules/system/src/Tests/Database/UpdateTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php rename to core/modules/system/src/Tests/Database/UpdateTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php b/core/modules/system/src/Tests/Datetime/DateTimePlusIntlTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php rename to core/modules/system/src/Tests/Datetime/DateTimePlusIntlTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php b/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php rename to core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ContentNegotiationTest.php b/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ContentNegotiationTest.php rename to core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php rename to core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ServiceDestructionTest.php b/core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ServiceDestructionTest.php rename to core/modules/system/src/Tests/DrupalKernel/ServiceDestructionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php rename to core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php b/core/modules/system/src/Tests/Entity/EntityAccessTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php rename to core/modules/system/src/Tests/Entity/EntityAccessTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiInfoTest.php b/core/modules/system/src/Tests/Entity/EntityApiInfoTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiInfoTest.php rename to core/modules/system/src/Tests/Entity/EntityApiInfoTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php b/core/modules/system/src/Tests/Entity/EntityApiTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php rename to core/modules/system/src/Tests/Entity/EntityApiTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityBCDecoratorTest.php b/core/modules/system/src/Tests/Entity/EntityBCDecoratorTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityBCDecoratorTest.php rename to core/modules/system/src/Tests/Entity/EntityBCDecoratorTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php rename to core/modules/system/src/Tests/Entity/EntityCrudHookTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php rename to core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php rename to core/modules/system/src/Tests/Entity/EntityFieldTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php b/core/modules/system/src/Tests/Entity/EntityFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php rename to core/modules/system/src/Tests/Entity/EntityFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityLabelTest.php b/core/modules/system/src/Tests/Entity/EntityLabelTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityLabelTest.php rename to core/modules/system/src/Tests/Entity/EntityLabelTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php b/core/modules/system/src/Tests/Entity/EntityManagerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php rename to core/modules/system/src/Tests/Entity/EntityManagerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php b/core/modules/system/src/Tests/Entity/EntityOperationsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php rename to core/modules/system/src/Tests/Entity/EntityOperationsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php rename to core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php rename to core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php rename to core/modules/system/src/Tests/Entity/EntityQueryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php rename to core/modules/system/src/Tests/Entity/EntityRevisionsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationFormTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationFormTest.php rename to core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php rename to core/modules/system/src/Tests/Entity/EntityTranslationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUUIDTest.php b/core/modules/system/src/Tests/Entity/EntityUUIDTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUUIDTest.php rename to core/modules/system/src/Tests/Entity/EntityUUIDTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php rename to core/modules/system/src/Tests/Entity/EntityUnitTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php b/core/modules/system/src/Tests/Entity/EntityUriTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php rename to core/modules/system/src/Tests/Entity/EntityUriTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php b/core/modules/system/src/Tests/Entity/EntityValidationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php rename to core/modules/system/src/Tests/Entity/EntityValidationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php rename to core/modules/system/src/Tests/Entity/EntityViewControllerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/FieldAccessTest.php b/core/modules/system/src/Tests/Entity/FieldAccessTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/FieldAccessTest.php rename to core/modules/system/src/Tests/Entity/FieldAccessTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Entity/FieldSqlStorageTest.php rename to core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ConfigTest.php b/core/modules/system/src/Tests/File/ConfigTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/ConfigTest.php rename to core/modules/system/src/Tests/File/ConfigTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php rename to core/modules/system/src/Tests/File/DirectoryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php b/core/modules/system/src/Tests/File/FileTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php rename to core/modules/system/src/Tests/File/FileTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php b/core/modules/system/src/Tests/File/MimeTypeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php rename to core/modules/system/src/Tests/File/MimeTypeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php b/core/modules/system/src/Tests/File/NameMungingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php rename to core/modules/system/src/Tests/File/NameMungingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ReadOnlyStreamWrapperTest.php b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/ReadOnlyStreamWrapperTest.php rename to core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileDirectoryTest.php rename to core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileScanDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileScanDirectoryTest.php rename to core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedCopyTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedCopyTest.php rename to core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php rename to core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteTest.php rename to core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedMoveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedMoveTest.php rename to core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedSaveDataTest.php rename to core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php b/core/modules/system/src/Tests/File/ScanDirectoryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php rename to core/modules/system/src/Tests/File/ScanDirectoryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php b/core/modules/system/src/Tests/File/StreamWrapperTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php rename to core/modules/system/src/Tests/File/StreamWrapperTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php b/core/modules/system/src/Tests/File/UnmanagedCopyTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php rename to core/modules/system/src/Tests/File/UnmanagedCopyTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php rename to core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php rename to core/modules/system/src/Tests/File/UnmanagedDeleteTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php b/core/modules/system/src/Tests/File/UnmanagedMoveTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php rename to core/modules/system/src/Tests/File/UnmanagedMoveTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php rename to core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php rename to core/modules/system/src/Tests/File/UrlRewritingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/FileTransferTest.php b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/FileTransferTest.php rename to core/modules/system/src/Tests/FileTransfer/FileTransferTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/MockTestConnection.php b/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/MockTestConnection.php rename to core/modules/system/src/Tests/FileTransfer/MockTestConnection.php diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/TestFileTransfer.php b/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/TestFileTransfer.php rename to core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php b/core/modules/system/src/Tests/Form/AlterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php rename to core/modules/system/src/Tests/Form/AlterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php rename to core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php b/core/modules/system/src/Tests/Form/CheckboxTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php rename to core/modules/system/src/Tests/Form/CheckboxTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ConfirmFormTest.php b/core/modules/system/src/Tests/Form/ConfirmFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ConfirmFormTest.php rename to core/modules/system/src/Tests/Form/ConfirmFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php b/core/modules/system/src/Tests/Form/ElementTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php rename to core/modules/system/src/Tests/Form/ElementTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php rename to core/modules/system/src/Tests/Form/ElementsLabelsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php rename to core/modules/system/src/Tests/Form/ElementsTableSelectTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php rename to core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php b/core/modules/system/src/Tests/Form/EmailTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php rename to core/modules/system/src/Tests/Form/EmailTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FileInclusionTest.php b/core/modules/system/src/Tests/Form/FileInclusionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/FileInclusionTest.php rename to core/modules/system/src/Tests/Form/FileInclusionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php b/core/modules/system/src/Tests/Form/FormCacheTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php rename to core/modules/system/src/Tests/Form/FormCacheTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php b/core/modules/system/src/Tests/Form/FormObjectTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php rename to core/modules/system/src/Tests/Form/FormObjectTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php rename to core/modules/system/src/Tests/Form/FormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/HTMLIdTest.php b/core/modules/system/src/Tests/Form/HTMLIdTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/HTMLIdTest.php rename to core/modules/system/src/Tests/Form/HTMLIdTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php rename to core/modules/system/src/Tests/Form/LanguageSelectElementTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php rename to core/modules/system/src/Tests/Form/ProgrammaticTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php rename to core/modules/system/src/Tests/Form/RebuildTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RedirectTest.php b/core/modules/system/src/Tests/Form/RedirectTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/RedirectTest.php rename to core/modules/system/src/Tests/Form/RedirectTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php rename to core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php rename to core/modules/system/src/Tests/Form/StateValuesCleanTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php b/core/modules/system/src/Tests/Form/StorageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php rename to core/modules/system/src/Tests/Form/StorageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php b/core/modules/system/src/Tests/Form/SystemConfigFormTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php rename to core/modules/system/src/Tests/Form/SystemConfigFormTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php b/core/modules/system/src/Tests/Form/TriggeringElementTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php rename to core/modules/system/src/Tests/Form/TriggeringElementTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php b/core/modules/system/src/Tests/Form/UrlTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php rename to core/modules/system/src/Tests/Form/UrlTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php rename to core/modules/system/src/Tests/Form/ValidationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php b/core/modules/system/src/Tests/Form/WrapperTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php rename to core/modules/system/src/Tests/Form/WrapperTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php rename to core/modules/system/src/Tests/Image/ToolkitGdTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php b/core/modules/system/src/Tests/Image/ToolkitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php rename to core/modules/system/src/Tests/Image/ToolkitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php rename to core/modules/system/src/Tests/Image/ToolkitTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php rename to core/modules/system/src/Tests/Installer/InstallerLanguageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php rename to core/modules/system/src/Tests/Installer/InstallerTranslationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/SiteNameTest.php b/core/modules/system/src/Tests/Installer/SiteNameTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Installer/SiteNameTest.php rename to core/modules/system/src/Tests/Installer/SiteNameTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php b/core/modules/system/src/Tests/InstallerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/InstallerTest.php rename to core/modules/system/src/Tests/InstallerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php rename to core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php rename to core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php rename to core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php rename to core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php rename to core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php b/core/modules/system/src/Tests/Lock/LockFunctionalTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php rename to core/modules/system/src/Tests/Lock/LockFunctionalTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Lock/LockUnitTest.php b/core/modules/system/src/Tests/Lock/LockUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Lock/LockUnitTest.php rename to core/modules/system/src/Tests/Lock/LockUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php rename to core/modules/system/src/Tests/Mail/HtmlToTextTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/src/Tests/Mail/MailTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php rename to core/modules/system/src/Tests/Mail/MailTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/WrapMailUnitTest.php b/core/modules/system/src/Tests/Mail/WrapMailUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Mail/WrapMailUnitTest.php rename to core/modules/system/src/Tests/Mail/WrapMailUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php rename to core/modules/system/src/Tests/Menu/BreadcrumbTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php b/core/modules/system/src/Tests/Menu/LinksTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php rename to core/modules/system/src/Tests/Menu/LinksTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalActionTest.php b/core/modules/system/src/Tests/Menu/LocalActionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/LocalActionTest.php rename to core/modules/system/src/Tests/Menu/LocalActionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php b/core/modules/system/src/Tests/Menu/LocalTasksTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php rename to core/modules/system/src/Tests/Menu/LocalTasksTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php rename to core/modules/system/src/Tests/Menu/MenuRouterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php b/core/modules/system/src/Tests/Menu/MenuTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php rename to core/modules/system/src/Tests/Menu/MenuTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTranslateTest.php b/core/modules/system/src/Tests/Menu/MenuTranslateTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuTranslateTest.php rename to core/modules/system/src/Tests/Menu/MenuTranslateTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php b/core/modules/system/src/Tests/Menu/RebuildTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php rename to core/modules/system/src/Tests/Menu/RebuildTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php b/core/modules/system/src/Tests/Menu/TrailTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php rename to core/modules/system/src/Tests/Menu/TrailTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php b/core/modules/system/src/Tests/Menu/TreeAccessTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php rename to core/modules/system/src/Tests/Menu/TreeAccessTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php b/core/modules/system/src/Tests/Menu/TreeDataUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php rename to core/modules/system/src/Tests/Menu/TreeDataUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/src/Tests/Menu/TreeOutputTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php rename to core/modules/system/src/Tests/Menu/TreeOutputTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php b/core/modules/system/src/Tests/Module/ClassLoaderTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php rename to core/modules/system/src/Tests/Module/ClassLoaderTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/src/Tests/Module/DependencyTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php rename to core/modules/system/src/Tests/Module/DependencyTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php b/core/modules/system/src/Tests/Module/EnableDisableTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php rename to core/modules/system/src/Tests/Module/EnableDisableTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php b/core/modules/system/src/Tests/Module/HookRequirementsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php rename to core/modules/system/src/Tests/Module/HookRequirementsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php b/core/modules/system/src/Tests/Module/InstallTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php rename to core/modules/system/src/Tests/Module/InstallTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/src/Tests/Module/ModuleApiTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php rename to core/modules/system/src/Tests/Module/ModuleApiTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php b/core/modules/system/src/Tests/Module/ModuleEnableTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php rename to core/modules/system/src/Tests/Module/ModuleEnableTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php rename to core/modules/system/src/Tests/Module/ModuleTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php b/core/modules/system/src/Tests/Module/RequiredTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php rename to core/modules/system/src/Tests/Module/RequiredTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php rename to core/modules/system/src/Tests/Module/UninstallTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/VersionTest.php b/core/modules/system/src/Tests/Module/VersionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Module/VersionTest.php rename to core/modules/system/src/Tests/Module/VersionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php b/core/modules/system/src/Tests/Pager/PagerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php rename to core/modules/system/src/Tests/Pager/PagerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php b/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php rename to core/modules/system/src/Tests/ParamConverter/UpcastingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php b/core/modules/system/src/Tests/Path/AliasTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php rename to core/modules/system/src/Tests/Path/AliasTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php b/core/modules/system/src/Tests/Path/MatchPathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php rename to core/modules/system/src/Tests/Path/MatchPathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/PathUnitTestBase.php b/core/modules/system/src/Tests/Path/PathUnitTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Path/PathUnitTestBase.php rename to core/modules/system/src/Tests/Path/PathUnitTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAliasFixtures.php b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Path/UrlAliasFixtures.php rename to core/modules/system/src/Tests/Path/UrlAliasFixtures.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php rename to core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/AlterDecoratorTest.php b/core/modules/system/src/Tests/Plugin/AlterDecoratorTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/AlterDecoratorTest.php rename to core/modules/system/src/Tests/Plugin/AlterDecoratorTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorLanguageTest.php b/core/modules/system/src/Tests/Plugin/CacheDecoratorLanguageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorLanguageTest.php rename to core/modules/system/src/Tests/Plugin/CacheDecoratorLanguageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorTest.php b/core/modules/system/src/Tests/Plugin/CacheDecoratorTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorTest.php rename to core/modules/system/src/Tests/Plugin/CacheDecoratorTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/ContextPluginTest.php b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/ContextPluginTest.php rename to core/modules/system/src/Tests/Plugin/ContextPluginTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/DerivativeTest.php b/core/modules/system/src/Tests/Plugin/DerivativeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/DerivativeTest.php rename to core/modules/system/src/Tests/Plugin/DerivativeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php similarity index 74% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php rename to core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php index d2fba9b..c85a9b6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php +++ b/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php @@ -57,9 +57,15 @@ public function setUp() { 'provider' => 'plugin_test', ), ); - $namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib')); - $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/fruit', $namespaces); - $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $namespaces); + $namespaces = new \ArrayObject(array( + 'Drupal\plugin_test' => array( + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test', + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib', + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/src', + ), + )); + $this->discovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\plugin_test\fruit'); + $this->emptyDiscovery = new AnnotatedClassDiscovery($namespaces, 'Plugin\non_existing_module\non_existing_plugin_type'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php similarity index 57% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php rename to core/modules/system/src/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php index b572919..12d7ded 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php +++ b/core/modules/system/src/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php @@ -41,13 +41,19 @@ protected function setUp() { 'provider' => 'plugin_test', ), ); - $root_namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib')); - $annotation_namespaces = array( - 'Drupal\plugin_test\Plugin\Annotation' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib', - ); + $root_namespaces = new \ArrayObject(array( + 'Drupal\plugin_test' => array( + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test', + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib', + DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/src', + ), + )); + + $this->discovery = new AnnotatedClassDiscovery($root_namespaces, 'Plugin\plugin_test\custom_annotation', 'Drupal\plugin_test\Plugin\Annotation\PluginExample'); + $this->discovery->addAnnotationNamespace('Drupal\plugin_test\Plugin\Annotation'); - $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/custom_annotation', $root_namespaces, $annotation_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample'); - $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $root_namespaces, $annotation_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample'); + $this->emptyDiscovery = new AnnotatedClassDiscovery($root_namespaces, 'Plugin\non_existing_module\non_existing_plugin_type', 'Drupal\plugin_test\Plugin\Annotation\PluginExample'); + $this->emptyDiscovery->addAnnotationNamespace('Drupal\plugin_test\Plugin\Annotation'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php similarity index 80% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php rename to core/modules/system/src/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php index c005300..f0d3613 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php +++ b/core/modules/system/src/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php @@ -39,10 +39,13 @@ protected function setUp() { 'provider' => 'plugin_test', ), ); - $namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib')); - $this->discovery = new AnnotatedClassDiscovery('', $namespaces); + + $namespaces = new \ArrayObject(array( + 'Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test', + )); + $this->discovery = new AnnotatedClassDiscovery($namespaces); $empty_namespaces = new \ArrayObject(); - $this->emptyDiscovery = new AnnotatedClassDiscovery('', $empty_namespaces); + $this->emptyDiscovery = new AnnotatedClassDiscovery($empty_namespaces); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php b/core/modules/system/src/Tests/Plugin/Discovery/DiscoveryTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php rename to core/modules/system/src/Tests/Plugin/Discovery/DiscoveryTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/StaticDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/StaticDiscoveryTest.php rename to core/modules/system/src/Tests/Plugin/Discovery/StaticDiscoveryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/FactoryTest.php b/core/modules/system/src/Tests/Plugin/FactoryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/FactoryTest.php rename to core/modules/system/src/Tests/Plugin/FactoryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/InspectionTest.php b/core/modules/system/src/Tests/Plugin/InspectionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/InspectionTest.php rename to core/modules/system/src/Tests/Plugin/InspectionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginBagTest.php b/core/modules/system/src/Tests/Plugin/PluginBagTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/PluginBagTest.php rename to core/modules/system/src/Tests/Plugin/PluginBagTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php b/core/modules/system/src/Tests/Plugin/PluginTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php rename to core/modules/system/src/Tests/Plugin/PluginTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php b/core/modules/system/src/Tests/Queue/QueueTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php rename to core/modules/system/src/Tests/Queue/QueueTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php b/core/modules/system/src/Tests/Routing/ControllerResolverTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php rename to core/modules/system/src/Tests/Routing/ControllerResolverTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/src/Tests/Routing/MatcherDumperTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php rename to core/modules/system/src/Tests/Routing/MatcherDumperTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MimeTypeMatcherTest.php b/core/modules/system/src/Tests/Routing/MimeTypeMatcherTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MimeTypeMatcherTest.php rename to core/modules/system/src/Tests/Routing/MimeTypeMatcherTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php b/core/modules/system/src/Tests/Routing/MockAliasManager.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php rename to core/modules/system/src/Tests/Routing/MockAliasManager.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockController.php b/core/modules/system/src/Tests/Routing/MockController.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockController.php rename to core/modules/system/src/Tests/Routing/MockController.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockMatcher.php b/core/modules/system/src/Tests/Routing/MockMatcher.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockMatcher.php rename to core/modules/system/src/Tests/Routing/MockMatcher.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php b/core/modules/system/src/Tests/Routing/MockRouteProvider.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php rename to core/modules/system/src/Tests/Routing/MockRouteProvider.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php b/core/modules/system/src/Tests/Routing/RouteProviderTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php rename to core/modules/system/src/Tests/Routing/RouteProviderTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php b/core/modules/system/src/Tests/Routing/RouterPermissionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php rename to core/modules/system/src/Tests/Routing/RouterPermissionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php rename to core/modules/system/src/Tests/Routing/RouterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php b/core/modules/system/src/Tests/Routing/RoutingFixtures.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php rename to core/modules/system/src/Tests/Routing/RoutingFixtures.php diff --git a/core/modules/system/lib/Drupal/system/Tests/ServiceProvider/ServiceProviderTest.php b/core/modules/system/src/Tests/ServiceProvider/ServiceProviderTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/ServiceProvider/ServiceProviderTest.php rename to core/modules/system/src/Tests/ServiceProvider/ServiceProviderTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php b/core/modules/system/src/Tests/Session/SessionHttpsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php rename to core/modules/system/src/Tests/Session/SessionHttpsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php rename to core/modules/system/src/Tests/Session/SessionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php b/core/modules/system/src/Tests/System/AccessDeniedTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php rename to core/modules/system/src/Tests/System/AccessDeniedTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php b/core/modules/system/src/Tests/System/AdminMetaTagTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php rename to core/modules/system/src/Tests/System/AdminMetaTagTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php rename to core/modules/system/src/Tests/System/AdminTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php b/core/modules/system/src/Tests/System/CronRunTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php rename to core/modules/system/src/Tests/System/CronRunTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/src/Tests/System/DateFormatsLanguageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php rename to core/modules/system/src/Tests/System/DateFormatsLanguageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLockedTest.php b/core/modules/system/src/Tests/System/DateFormatsLockedTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLockedTest.php rename to core/modules/system/src/Tests/System/DateFormatsLockedTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/src/Tests/System/DateTimeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php rename to core/modules/system/src/Tests/System/DateTimeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php rename to core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php b/core/modules/system/src/Tests/System/ErrorHandlerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php rename to core/modules/system/src/Tests/System/ErrorHandlerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php b/core/modules/system/src/Tests/System/ExceptionControllerTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php rename to core/modules/system/src/Tests/System/ExceptionControllerTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/FloodTest.php b/core/modules/system/src/Tests/System/FloodTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/FloodTest.php rename to core/modules/system/src/Tests/System/FloodTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php b/core/modules/system/src/Tests/System/FrontPageTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php rename to core/modules/system/src/Tests/System/FrontPageTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IgnoreSlaveSubscriberTest.php b/core/modules/system/src/Tests/System/IgnoreSlaveSubscriberTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/IgnoreSlaveSubscriberTest.php rename to core/modules/system/src/Tests/System/IgnoreSlaveSubscriberTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php b/core/modules/system/src/Tests/System/IndexPhpTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php rename to core/modules/system/src/Tests/System/IndexPhpTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php b/core/modules/system/src/Tests/System/InfoAlterTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php rename to core/modules/system/src/Tests/System/InfoAlterTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/src/Tests/System/MainContentFallbackTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php rename to core/modules/system/src/Tests/System/MainContentFallbackTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php b/core/modules/system/src/Tests/System/PageNotFoundTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php rename to core/modules/system/src/Tests/System/PageNotFoundTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php b/core/modules/system/src/Tests/System/PageTitleTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php rename to core/modules/system/src/Tests/System/PageTitleTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php b/core/modules/system/src/Tests/System/PasswordHashingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php rename to core/modules/system/src/Tests/System/PasswordHashingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php b/core/modules/system/src/Tests/System/RetrieveFileTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php rename to core/modules/system/src/Tests/System/RetrieveFileTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php b/core/modules/system/src/Tests/System/SettingsRewriteTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php rename to core/modules/system/src/Tests/System/SettingsRewriteTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ShutdownFunctionsTest.php b/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/ShutdownFunctionsTest.php rename to core/modules/system/src/Tests/System/ShutdownFunctionsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php rename to core/modules/system/src/Tests/System/SiteMaintenanceTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemAuthorizeTest.php b/core/modules/system/src/Tests/System/SystemAuthorizeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/SystemAuthorizeTest.php rename to core/modules/system/src/Tests/System/SystemAuthorizeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php rename to core/modules/system/src/Tests/System/SystemConfigFormTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php rename to core/modules/system/src/Tests/System/ThemeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php b/core/modules/system/src/Tests/System/TokenReplaceTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php rename to core/modules/system/src/Tests/System/TokenReplaceTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenScanTest.php b/core/modules/system/src/Tests/System/TokenScanTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/System/TokenScanTest.php rename to core/modules/system/src/Tests/System/TokenScanTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php rename to core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php b/core/modules/system/src/Tests/Theme/FastTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php rename to core/modules/system/src/Tests/Theme/FastTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php rename to core/modules/system/src/Tests/Theme/FunctionsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php b/core/modules/system/src/Tests/Theme/HtmlTplPhpAttributesTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php rename to core/modules/system/src/Tests/Theme/HtmlTplPhpAttributesTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryTest.php b/core/modules/system/src/Tests/Theme/RegistryTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/RegistryTest.php rename to core/modules/system/src/Tests/Theme/RegistryTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/src/Tests/Theme/TableTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php rename to core/modules/system/src/Tests/Theme/TableTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeEarlyInitializationTest.php b/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeEarlyInitializationTest.php rename to core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeInfoStylesTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoStylesTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeInfoStylesTest.php rename to core/modules/system/src/Tests/Theme/ThemeInfoStylesTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php b/core/modules/system/src/Tests/Theme/ThemeTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php rename to core/modules/system/src/Tests/Theme/ThemeTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestPhpTemplate.php b/core/modules/system/src/Tests/Theme/ThemeTestPhpTemplate.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestPhpTemplate.php rename to core/modules/system/src/Tests/Theme/ThemeTestPhpTemplate.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php b/core/modules/system/src/Tests/Theme/ThemeTestTwig.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php rename to core/modules/system/src/Tests/Theme/ThemeTestTwig.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php b/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php rename to core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigExtensionTest.php b/core/modules/system/src/Tests/Theme/TwigExtensionTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigExtensionTest.php rename to core/modules/system/src/Tests/Theme/TwigExtensionTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceObjectTest.php b/core/modules/system/src/Tests/Theme/TwigReferenceObjectTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceObjectTest.php rename to core/modules/system/src/Tests/Theme/TwigReferenceObjectTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceUnitTest.php b/core/modules/system/src/Tests/Theme/TwigReferenceUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceUnitTest.php rename to core/modules/system/src/Tests/Theme/TwigReferenceUnitTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php b/core/modules/system/src/Tests/Theme/TwigSettingsTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php rename to core/modules/system/src/Tests/Theme/TwigSettingsTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php b/core/modules/system/src/Tests/Theme/TwigTransTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php rename to core/modules/system/src/Tests/Theme/TwigTransTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Transliteration/TransliterationTest.php b/core/modules/system/src/Tests/Transliteration/TransliterationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Transliteration/TransliterationTest.php rename to core/modules/system/src/Tests/Transliteration/TransliterationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php rename to core/modules/system/src/Tests/TypedData/TypedDataTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php b/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php rename to core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyMissingTest.php b/core/modules/system/src/Tests/Update/DependencyMissingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyMissingTest.php rename to core/modules/system/src/Tests/Update/DependencyMissingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php b/core/modules/system/src/Tests/Update/DependencyOrderingTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php rename to core/modules/system/src/Tests/Update/DependencyOrderingTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/src/Tests/Update/UpdateScriptTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php rename to core/modules/system/src/Tests/Update/UpdateScriptTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ActionUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ActionUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ActionUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ActionUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/BareMinimalUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/BareMinimalUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/BareStandardUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/BareStandardUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BlockUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/BlockUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BlockUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/BlockUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/DateUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/DateUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/DateUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/DateUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/FieldUIUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/FieldUIUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/FieldUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/FieldUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/FilledMinimalUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/FilledMinimalUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/FilledStandardUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/FilledStandardUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilterFormatUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/FilterFormatUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilterFormatUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/FilterFormatUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ForumUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ForumUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ForumUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ForumUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ImageUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ImageUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/LanguageUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/LanguageUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/MailUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/MailUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ModulesDisabledUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ModulesDisabledUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ShortcutUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/ShortcutUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ShortcutUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/ShortcutUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/StateSystemUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/StateSystemUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/SystemUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/SystemUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/src/Tests/Upgrade/UpgradePathTestBase.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php rename to core/modules/system/src/Tests/Upgrade/UpgradePathTestBase.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPermissionUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/UserPermissionUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPermissionUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/UserPermissionUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/UserPictureUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/UserPictureUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/UserRoleUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/UserRoleUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php b/core/modules/system/src/Tests/Upgrade/UuidUpgradePathTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php rename to core/modules/system/src/Tests/Upgrade/UuidUpgradePathTest.php diff --git a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php b/core/modules/system/src/Tests/Uuid/UuidUnitTest.php similarity index 100% rename from core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php rename to core/modules/system/src/Tests/Uuid/UuidUnitTest.php diff --git a/core/modules/system/tests/http.php b/core/modules/system/tests/http.php index 662031f..10f4e20 100644 --- a/core/modules/system/tests/http.php +++ b/core/modules/system/tests/http.php @@ -18,6 +18,6 @@ // Change current directory to the Drupal root. chdir('../../../..'); -require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php'; +require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php'; require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc'; drupal_handle_request(TRUE); diff --git a/core/modules/system/tests/https.php b/core/modules/system/tests/https.php index 247e6e5..54c8afa 100644 --- a/core/modules/system/tests/https.php +++ b/core/modules/system/tests/https.php @@ -20,6 +20,6 @@ // Change current directory to the Drupal root. chdir('../../../..'); -require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php'; +require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php'; require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc'; drupal_handle_request(TRUE); diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php b/core/modules/system/tests/modules/action_test/src/Plugin/Action/NoType.php similarity index 100% rename from core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php rename to core/modules/system/tests/modules/action_test/src/Plugin/Action/NoType.php diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php b/core/modules/system/tests/modules/action_test/src/Plugin/Action/SaveEntity.php similarity index 100% rename from core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php rename to core/modules/system/tests/modules/action_test/src/Plugin/Action/SaveEntity.php diff --git a/core/modules/system/tests/modules/ajax_forms_test/lib/Drupal/ajax_forms_test/Callbacks.php b/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php similarity index 100% rename from core/modules/system/tests/modules/ajax_forms_test/lib/Drupal/ajax_forms_test/Callbacks.php rename to core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php diff --git a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestController.php b/core/modules/system/tests/modules/ajax_test/src/AjaxTestController.php similarity index 100% rename from core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestController.php rename to core/modules/system/tests/modules/ajax_test/src/AjaxTestController.php diff --git a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestForm.php b/core/modules/system/tests/modules/ajax_test/src/AjaxTestForm.php similarity index 100% rename from core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestForm.php rename to core/modules/system/tests/modules/ajax_test/src/AjaxTestForm.php diff --git a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php similarity index 100% rename from core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php rename to core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php diff --git a/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php b/core/modules/system/tests/modules/condition_test/src/FormController.php similarity index 100% rename from core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php rename to core/modules/system/tests/modules/condition_test/src/FormController.php diff --git a/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php b/core/modules/system/tests/modules/design_test/src/Controller/DesignTestController.php similarity index 100% rename from core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php rename to core/modules/system/tests/modules/design_test/src/Controller/DesignTestController.php diff --git a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php b/core/modules/system/tests/modules/entity_cache_test_dependency/src/Entity/EntityCacheTest.php similarity index 100% rename from core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php rename to core/modules/system/tests/modules/entity_cache_test_dependency/src/Entity/EntityCacheTest.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRender.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRender.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestAccessController.php b/core/modules/system/tests/modules/entity_test/src/EntityTestAccessController.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestAccessController.php rename to core/modules/system/tests/modules/entity_test/src/EntityTestAccessController.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php b/core/modules/system/tests/modules/entity_test/src/EntityTestFormController.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php rename to core/modules/system/tests/modules/entity_test/src/EntityTestFormController.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestListController.php b/core/modules/system/tests/modules/entity_test/src/EntityTestListController.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestListController.php rename to core/modules/system/tests/modules/entity_test/src/EntityTestListController.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php b/core/modules/system/tests/modules/entity_test/src/EntityTestRenderController.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php rename to core/modules/system/tests/modules/entity_test/src/EntityTestRenderController.php diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestStorageController.php b/core/modules/system/tests/modules/entity_test/src/EntityTestStorageController.php similarity index 100% rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestStorageController.php rename to core/modules/system/tests/modules/entity_test/src/EntityTestStorageController.php diff --git a/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php b/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php similarity index 100% rename from core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php rename to core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/AutocompleteController.php b/core/modules/system/tests/modules/form_test/src/AutocompleteController.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/AutocompleteController.php rename to core/modules/system/tests/modules/form_test/src/AutocompleteController.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Callbacks.php b/core/modules/system/tests/modules/form_test/src/Callbacks.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Callbacks.php rename to core/modules/system/tests/modules/form_test/src/Callbacks.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php b/core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php rename to core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php b/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php rename to core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/EventSubscriber/FormTestEventSubscriber.php b/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/EventSubscriber/FormTestEventSubscriber.php rename to core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestArgumentsObject.php b/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestArgumentsObject.php rename to core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestAutocompleteForm.php b/core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestAutocompleteForm.php rename to core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php b/core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php rename to core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestObject.php b/core/modules/system/tests/modules/form_test/src/FormTestObject.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestObject.php rename to core/modules/system/tests/modules/form_test/src/FormTestObject.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestServiceObject.php b/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestServiceObject.php rename to core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php b/core/modules/system/tests/modules/form_test/src/SystemConfigFormTestForm.php similarity index 100% rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php rename to core/modules/system/tests/modules/form_test/src/SystemConfigFormTestForm.php diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php similarity index 100% rename from core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/BrokenToolkit.php diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php similarity index 100% rename from core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/system/tests/modules/menu_test/src/EventSubscriber/MaintenanceModeSubscriber.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php rename to core/modules/system/tests/modules/menu_test/src/EventSubscriber/MaintenanceModeSubscriber.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/MenuTestLocalAction.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/MenuTestLocalAction.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksEdit.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksEdit.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksEdit.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksEdit.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettings.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettings.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettings.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettings.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub2.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub2.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub2.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub2.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksView.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksView.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksView.php rename to core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksView.php diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/TestControllers.php b/core/modules/system/tests/modules/menu_test/src/TestControllers.php similarity index 100% rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/TestControllers.php rename to core/modules/system/tests/modules/menu_test/src/TestControllers.php diff --git a/core/modules/system/tests/modules/paramconverter_test/lib/Drupal/paramconverter_test/TestControllers.php b/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php similarity index 100% rename from core/modules/system/tests/modules/paramconverter_test/lib/Drupal/paramconverter_test/TestControllers.php rename to core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php b/core/modules/system/tests/modules/plugin_test/src/CustomDirectoryExample1.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php rename to core/modules/system/tests/modules/plugin_test/src/CustomDirectoryExample1.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php b/core/modules/system/tests/modules/plugin_test/src/CustomDirectoryExample2.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php rename to core/modules/system/tests/modules/plugin_test/src/CustomDirectoryExample2.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/AlterDecoratorTestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/AlterDecoratorTestPluginManager.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/AlterDecoratorTestPluginManager.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/AlterDecoratorTestPluginManager.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/Annotation/PluginExample.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/Annotation/PluginExample.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/CachedMockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/CachedMockBlockManager.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/CachedMockBlockManager.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/CachedMockBlockManager.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/DefaultsTestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/DefaultsTestPluginManager.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/MockBlockManager.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginBag.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginBag.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginBag.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginBag.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginManager.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/custom_annotation/Example1.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/custom_annotation/Example1.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/custom_annotation/Example2.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/custom_annotation/Example2.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Banana.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Banana.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/NonAnnotatedClass.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/NonAnnotatedClass.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/NonAnnotatedClass.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/NonAnnotatedClass.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/README.txt b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/README.txt similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/README.txt rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/README.txt diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockComplexContextBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockComplexContextBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockComplexContextBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockTestBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockTestBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserLoginBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserLoginBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserNameBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserNameBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserNameBlock.php diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/TypedDataStringBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php similarity index 100% rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/TypedDataStringBlock.php rename to core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php 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/src/Access/DefinedTestAccessCheck.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php rename to core/modules/system/tests/modules/router_test/src/Access/DefinedTestAccessCheck.php 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/src/Access/TestAccessCheck.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php rename to core/modules/system/tests/modules/router_test/src/Access/TestAccessCheck.php diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php b/core/modules/system/tests/modules/router_test/src/RouteTestSubscriber.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php rename to core/modules/system/tests/modules/router_test/src/RouteTestSubscriber.php diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestServiceProvider.php b/core/modules/system/tests/modules/router_test/src/RouterTestServiceProvider.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestServiceProvider.php rename to core/modules/system/tests/modules/router_test/src/RouterTestServiceProvider.php diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php b/core/modules/system/tests/modules/router_test/src/TestContent.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php rename to core/modules/system/tests/modules/router_test/src/TestContent.php diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestControllers.php b/core/modules/system/tests/modules/router_test/src/TestControllers.php similarity index 100% rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestControllers.php rename to core/modules/system/tests/modules/router_test/src/TestControllers.php diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/ServiceProviderTestServiceProvider.php b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php similarity index 100% rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/ServiceProviderTestServiceProvider.php rename to core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php similarity index 100% rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php rename to core/modules/system/tests/modules/service_provider_test/src/TestClass.php diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php b/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php similarity index 100% rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php rename to core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php diff --git a/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php b/core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php similarity index 100% rename from core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php rename to core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php diff --git a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php b/core/modules/system/tests/modules/system_mail_failure_test/src/TestPhpMailFailure.php similarity index 100% rename from core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php rename to core/modules/system/tests/modules/system_mail_failure_test/src/TestPhpMailFailure.php diff --git a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/PageCacheAcceptHeaderController.php b/core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php similarity index 100% rename from core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/PageCacheAcceptHeaderController.php rename to core/modules/system/tests/modules/system_test/src/Controller/PageCacheAcceptHeaderController.php diff --git a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/MockFileTransfer.php b/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php similarity index 100% rename from core/modules/system/tests/modules/system_test/lib/Drupal/system_test/MockFileTransfer.php rename to core/modules/system/tests/modules/system_test/src/MockFileTransfer.php diff --git a/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php similarity index 100% rename from core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php rename to core/modules/system/tests/modules/test_page_test/src/Controller/Test.php diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php similarity index 100% rename from core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php rename to core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php b/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php similarity index 100% rename from core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php rename to core/modules/system/tests/modules/theme_test/src/ThemeTestController.php diff --git a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtension/TestExtension.php b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php similarity index 100% rename from core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtension/TestExtension.php rename to core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php diff --git a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php similarity index 100% rename from core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php rename to core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php diff --git a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php similarity index 100% rename from core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php rename to core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/Controller/URLAlterTestController.php b/core/modules/system/tests/modules/url_alter_test/src/Controller/URLAlterTestController.php similarity index 100% rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/Controller/URLAlterTestController.php rename to core/modules/system/tests/modules/url_alter_test/src/Controller/URLAlterTestController.php diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php similarity index 100% rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php rename to core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php similarity index 100% rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php rename to core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php diff --git a/core/modules/system/tests/Drupal/system/Tests/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php similarity index 100% rename from core/modules/system/tests/Drupal/system/Tests/Transliteration/MachineNameControllerTest.php rename to core/modules/system/tests/src/Transliteration/MachineNameControllerTest.php diff --git a/core/modules/system/tests/themes/test_theme/lib/Drupal/test_theme/ThemeClass.php b/core/modules/system/tests/themes/test_theme/src/ThemeClass.php similarity index 100% rename from core/modules/system/tests/themes/test_theme/lib/Drupal/test_theme/ThemeClass.php rename to core/modules/system/tests/themes/test_theme/src/ThemeClass.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php b/core/modules/taxonomy/src/Controller/TaxonomyController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php rename to core/modules/taxonomy/src/Controller/TaxonomyController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php b/core/modules/taxonomy/src/Controller/TermAutocompleteController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php rename to core/modules/taxonomy/src/Controller/TermAutocompleteController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php rename to core/modules/taxonomy/src/Entity/Term.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/src/Entity/Vocabulary.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php rename to core/modules/taxonomy/src/Entity/Vocabulary.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php rename to core/modules/taxonomy/src/Form/OverviewTerms.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/src/Form/TermDeleteForm.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php rename to core/modules/taxonomy/src/Form/TermDeleteForm.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php b/core/modules/taxonomy/src/Form/VocabularyDeleteForm.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php rename to core/modules/taxonomy/src/Form/VocabularyDeleteForm.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php b/core/modules/taxonomy/src/Form/VocabularyResetForm.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php rename to core/modules/taxonomy/src/Form/VocabularyResetForm.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php b/core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php rename to core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/src/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php rename to core/modules/taxonomy/src/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php b/core/modules/taxonomy/src/Plugin/field/formatter/LinkFormatter.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php rename to core/modules/taxonomy/src/Plugin/field/formatter/LinkFormatter.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php b/core/modules/taxonomy/src/Plugin/field/formatter/PlainFormatter.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php rename to core/modules/taxonomy/src/Plugin/field/formatter/PlainFormatter.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php b/core/modules/taxonomy/src/Plugin/field/formatter/RSSCategoryFormatter.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php rename to core/modules/taxonomy/src/Plugin/field/formatter/RSSCategoryFormatter.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php b/core/modules/taxonomy/src/Plugin/field/formatter/TaxonomyFormatterBase.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php rename to core/modules/taxonomy/src/Plugin/field/formatter/TaxonomyFormatterBase.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/src/Plugin/field/widget/TaxonomyAutocompleteWidget.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php rename to core/modules/taxonomy/src/Plugin/field/widget/TaxonomyAutocompleteWidget.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php rename to core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php rename to core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php rename to core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php rename to core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php rename to core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php rename to core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php rename to core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/src/Plugin/views/field/Language.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php rename to core/modules/taxonomy/src/Plugin/views/field/Language.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/src/Plugin/views/field/LinkEdit.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php rename to core/modules/taxonomy/src/Plugin/views/field/LinkEdit.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/field/Taxonomy.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php rename to core/modules/taxonomy/src/Plugin/views/field/Taxonomy.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php rename to core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php rename to core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php rename to core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php rename to core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php rename to core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php b/core/modules/taxonomy/src/TermAccessController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php rename to core/modules/taxonomy/src/TermAccessController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/src/TermFormController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php rename to core/modules/taxonomy/src/TermFormController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermInterface.php b/core/modules/taxonomy/src/TermInterface.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermInterface.php rename to core/modules/taxonomy/src/TermInterface.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php b/core/modules/taxonomy/src/TermRenderController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php rename to core/modules/taxonomy/src/TermRenderController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageController.php b/core/modules/taxonomy/src/TermStorageController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageController.php rename to core/modules/taxonomy/src/TermStorageController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageControllerInterface.php b/core/modules/taxonomy/src/TermStorageControllerInterface.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageControllerInterface.php rename to core/modules/taxonomy/src/TermStorageControllerInterface.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php b/core/modules/taxonomy/src/TermTranslationController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php rename to core/modules/taxonomy/src/TermTranslationController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php b/core/modules/taxonomy/src/Tests/EfqTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php rename to core/modules/taxonomy/src/Tests/EfqTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php b/core/modules/taxonomy/src/Tests/LegacyTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php rename to core/modules/taxonomy/src/Tests/LegacyTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php rename to core/modules/taxonomy/src/Tests/LoadMultipleTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php b/core/modules/taxonomy/src/Tests/RssTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php rename to core/modules/taxonomy/src/Tests/RssTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php rename to core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php rename to core/modules/taxonomy/src/Tests/TaxonomyTermReferenceItemTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php rename to core/modules/taxonomy/src/Tests/TaxonomyTestBase.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php b/core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php rename to core/modules/taxonomy/src/Tests/TermFieldMultipleVocabularyTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php b/core/modules/taxonomy/src/Tests/TermFieldTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php rename to core/modules/taxonomy/src/Tests/TermFieldTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php b/core/modules/taxonomy/src/Tests/TermIndexTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php rename to core/modules/taxonomy/src/Tests/TermIndexTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php b/core/modules/taxonomy/src/Tests/TermLanguageTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php rename to core/modules/taxonomy/src/Tests/TermLanguageTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php rename to core/modules/taxonomy/src/Tests/TermTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php b/core/modules/taxonomy/src/Tests/TermTranslationUITest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php rename to core/modules/taxonomy/src/Tests/TermTranslationUITest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermUnitTest.php b/core/modules/taxonomy/src/Tests/TermUnitTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermUnitTest.php rename to core/modules/taxonomy/src/Tests/TermUnitTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php b/core/modules/taxonomy/src/Tests/ThemeTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php rename to core/modules/taxonomy/src/Tests/ThemeTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php rename to core/modules/taxonomy/src/Tests/TokenReplaceTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php b/core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php rename to core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNode.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php rename to core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNode.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php rename to core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php rename to core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php rename to core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyPermissionsTest.php b/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyPermissionsTest.php rename to core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/src/Tests/VocabularyTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php rename to core/modules/taxonomy/src/Tests/VocabularyTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/src/Tests/VocabularyUnitTest.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php rename to core/modules/taxonomy/src/Tests/VocabularyUnitTest.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Type/TaxonomyTermReferenceItem.php b/core/modules/taxonomy/src/Type/TaxonomyTermReferenceItem.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/Type/TaxonomyTermReferenceItem.php rename to core/modules/taxonomy/src/Type/TaxonomyTermReferenceItem.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php b/core/modules/taxonomy/src/VocabularyAccessController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php rename to core/modules/taxonomy/src/VocabularyAccessController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/src/VocabularyFormController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php rename to core/modules/taxonomy/src/VocabularyFormController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyInterface.php b/core/modules/taxonomy/src/VocabularyInterface.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyInterface.php rename to core/modules/taxonomy/src/VocabularyInterface.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyListController.php b/core/modules/taxonomy/src/VocabularyListController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyListController.php rename to core/modules/taxonomy/src/VocabularyListController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php b/core/modules/taxonomy/src/VocabularyStorageController.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php rename to core/modules/taxonomy/src/VocabularyStorageController.php diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageControllerInterface.php b/core/modules/taxonomy/src/VocabularyStorageControllerInterface.php similarity index 100% rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageControllerInterface.php rename to core/modules/taxonomy/src/VocabularyStorageControllerInterface.php diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install index 7648ba0..b152723 100644 --- a/core/modules/taxonomy/taxonomy.install +++ b/core/modules/taxonomy/taxonomy.install @@ -14,7 +14,11 @@ */ function taxonomy_uninstall() { Drupal::entityManager()->addNamespaces(new ArrayIterator(array( - 'Drupal\taxonomy' => DRUPAL_ROOT . '/core/modules/taxonomy/lib', + 'Drupal\taxonomy' => array( + DRUPAL_ROOT . '/core/modules/taxonomy/lib/Drupal/taxonomy', + DRUPAL_ROOT . '/core/modules/taxonomy/lib', + DRUPAL_ROOT . '/core/modules/taxonomy/src', + ), ))); drupal_classloader_register('taxonomy', 'core/modules/taxonomy'); // Remove taxonomy_term bundles. diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php b/core/modules/telephone/src/Plugin/field/field_type/TelephoneItem.php similarity index 100% rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php rename to core/modules/telephone/src/Plugin/field/field_type/TelephoneItem.php diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php b/core/modules/telephone/src/Plugin/field/formatter/TelephoneLinkFormatter.php similarity index 100% rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php rename to core/modules/telephone/src/Plugin/field/formatter/TelephoneLinkFormatter.php diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/widget/TelephoneDefaultWidget.php b/core/modules/telephone/src/Plugin/field/widget/TelephoneDefaultWidget.php similarity index 100% rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/widget/TelephoneDefaultWidget.php rename to core/modules/telephone/src/Plugin/field/widget/TelephoneDefaultWidget.php diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php b/core/modules/telephone/src/Tests/TelephoneFieldTest.php similarity index 100% rename from core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php rename to core/modules/telephone/src/Tests/TelephoneFieldTest.php diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php b/core/modules/telephone/src/Tests/TelephoneItemTest.php similarity index 100% rename from core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php rename to core/modules/telephone/src/Tests/TelephoneItemTest.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php b/core/modules/text/src/Plugin/field/field_type/TextItem.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php rename to core/modules/text/src/Plugin/field/field_type/TextItem.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php b/core/modules/text/src/Plugin/field/field_type/TextItemBase.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php rename to core/modules/text/src/Plugin/field/field_type/TextItemBase.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php b/core/modules/text/src/Plugin/field/field_type/TextLongItem.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php rename to core/modules/text/src/Plugin/field/field_type/TextLongItem.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php b/core/modules/text/src/Plugin/field/field_type/TextWithSummaryItem.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php rename to core/modules/text/src/Plugin/field/field_type/TextWithSummaryItem.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/text/src/Plugin/field/formatter/TextDefaultFormatter.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php rename to core/modules/text/src/Plugin/field/formatter/TextDefaultFormatter.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php b/core/modules/text/src/Plugin/field/formatter/TextPlainFormatter.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php rename to core/modules/text/src/Plugin/field/formatter/TextPlainFormatter.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php b/core/modules/text/src/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php rename to core/modules/text/src/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php b/core/modules/text/src/Plugin/field/formatter/TextTrimmedFormatter.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php rename to core/modules/text/src/Plugin/field/formatter/TextTrimmedFormatter.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php b/core/modules/text/src/Plugin/field/widget/TextareaWidget.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php rename to core/modules/text/src/Plugin/field/widget/TextareaWidget.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/text/src/Plugin/field/widget/TextareaWithSummaryWidget.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php rename to core/modules/text/src/Plugin/field/widget/TextareaWithSummaryWidget.php diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php b/core/modules/text/src/Plugin/field/widget/TextfieldWidget.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php rename to core/modules/text/src/Plugin/field/widget/TextfieldWidget.php diff --git a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php rename to core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php rename to core/modules/text/src/Tests/TextFieldTest.php diff --git a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php b/core/modules/text/src/Tests/TextSummaryTest.php similarity index 100% rename from core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php rename to core/modules/text/src/Tests/TextSummaryTest.php diff --git a/core/modules/text/lib/Drupal/text/TextProcessed.php b/core/modules/text/src/TextProcessed.php similarity index 100% rename from core/modules/text/lib/Drupal/text/TextProcessed.php rename to core/modules/text/src/TextProcessed.php diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php b/core/modules/toolbar/src/Access/SubtreeAccess.php similarity index 100% rename from core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php rename to core/modules/toolbar/src/Access/SubtreeAccess.php diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php b/core/modules/toolbar/src/Routing/ToolbarController.php similarity index 100% rename from core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php rename to core/modules/toolbar/src/Routing/ToolbarController.php diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarHookToolbarTest.php b/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php similarity index 100% rename from core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarHookToolbarTest.php rename to core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php b/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php similarity index 100% rename from core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php rename to core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php diff --git a/core/modules/tour/lib/Drupal/tour/Annotation/Tip.php b/core/modules/tour/src/Annotation/Tip.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Annotation/Tip.php rename to core/modules/tour/src/Annotation/Tip.php diff --git a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php b/core/modules/tour/src/Entity/Tour.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Entity/Tour.php rename to core/modules/tour/src/Entity/Tour.php diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php rename to core/modules/tour/src/Plugin/tour/tip/TipPluginText.php diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php b/core/modules/tour/src/Tests/TourPluginTest.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php rename to core/modules/tour/src/Tests/TourPluginTest.php diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTest.php b/core/modules/tour/src/Tests/TourTest.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Tests/TourTest.php rename to core/modules/tour/src/Tests/TourTest.php diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php b/core/modules/tour/src/Tests/TourTestBase.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php rename to core/modules/tour/src/Tests/TourTestBase.php diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php b/core/modules/tour/src/Tests/TourTestBasic.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php rename to core/modules/tour/src/Tests/TourTestBasic.php diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginBase.php b/core/modules/tour/src/TipPluginBase.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/TipPluginBase.php rename to core/modules/tour/src/TipPluginBase.php diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginInterface.php b/core/modules/tour/src/TipPluginInterface.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/TipPluginInterface.php rename to core/modules/tour/src/TipPluginInterface.php diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginManager.php b/core/modules/tour/src/TipPluginManager.php similarity index 86% rename from core/modules/tour/lib/Drupal/tour/TipPluginManager.php rename to core/modules/tour/src/TipPluginManager.php index fb18d3b..88e0784 100644 --- a/core/modules/tour/lib/Drupal/tour/TipPluginManager.php +++ b/core/modules/tour/src/TipPluginManager.php @@ -31,8 +31,8 @@ class TipPluginManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\tour\Annotation' => $namespaces['Drupal\tour']); - parent::__construct('Plugin/tour/tip', $namespaces, $annotation_namespaces, 'Drupal\tour\Annotation\Tip'); + parent::__construct($namespaces, 'Plugin\tour\tip', 'Drupal\tour\Annotation\Tip'); + $this->addAnnotationNamespace('Drupal\tour\Annotation'); $this->alterInfo($module_handler, 'tour_tips_info'); $this->setCacheBackend($cache_backend, $language_manager, 'tour'); diff --git a/core/modules/tour/lib/Drupal/tour/TipsBag.php b/core/modules/tour/src/TipsBag.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/TipsBag.php rename to core/modules/tour/src/TipsBag.php diff --git a/core/modules/tour/lib/Drupal/tour/TourInterface.php b/core/modules/tour/src/TourInterface.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/TourInterface.php rename to core/modules/tour/src/TourInterface.php diff --git a/core/modules/tour/lib/Drupal/tour/TourRenderController.php b/core/modules/tour/src/TourRenderController.php similarity index 100% rename from core/modules/tour/lib/Drupal/tour/TourRenderController.php rename to core/modules/tour/src/TourRenderController.php diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php b/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php similarity index 100% rename from core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php rename to core/modules/tour/tests/tour_test/src/Controller/TourTestController.php diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php similarity index 100% rename from core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php rename to core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php b/core/modules/tracker/src/Plugin/views/argument/UserUid.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php rename to core/modules/tracker/src/Plugin/views/argument/UserUid.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php b/core/modules/tracker/src/Plugin/views/filter/UserUid.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php rename to core/modules/tracker/src/Plugin/views/filter/UserUid.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php rename to core/modules/tracker/src/Tests/TrackerNodeAccessTest.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php rename to core/modules/tracker/src/Tests/TrackerTest.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php rename to core/modules/tracker/src/Tests/Views/TrackerTestBase.php diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php similarity index 100% rename from core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php rename to core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/src/Tests/TranslationTest.php similarity index 100% rename from core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php rename to core/modules/translation/src/Tests/TranslationTest.php diff --git a/core/modules/update/lib/Drupal/update/Controller/UpdateController.php b/core/modules/update/src/Controller/UpdateController.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Controller/UpdateController.php rename to core/modules/update/src/Controller/UpdateController.php diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php b/core/modules/update/src/Tests/UpdateContribTest.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php rename to core/modules/update/src/Tests/UpdateContribTest.php diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php b/core/modules/update/src/Tests/UpdateCoreTest.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php rename to core/modules/update/src/Tests/UpdateCoreTest.php diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php b/core/modules/update/src/Tests/UpdateCoreUnitTest.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php rename to core/modules/update/src/Tests/UpdateCoreUnitTest.php diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php b/core/modules/update/src/Tests/UpdateTestBase.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php rename to core/modules/update/src/Tests/UpdateTestBase.php diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateUploadTest.php b/core/modules/update/src/Tests/UpdateUploadTest.php similarity index 100% rename from core/modules/update/lib/Drupal/update/Tests/UpdateUploadTest.php rename to core/modules/update/src/Tests/UpdateUploadTest.php diff --git a/core/modules/update/lib/Drupal/update/UpdateSettingsForm.php b/core/modules/update/src/UpdateSettingsForm.php similarity index 100% rename from core/modules/update/lib/Drupal/update/UpdateSettingsForm.php rename to core/modules/update/src/UpdateSettingsForm.php diff --git a/core/modules/update/tests/modules/update_test/lib/Drupal/update_test/Controller/UpdateTestController.php b/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php similarity index 100% rename from core/modules/update/tests/modules/update_test/lib/Drupal/update_test/Controller/UpdateTestController.php rename to core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php diff --git a/core/modules/update/tests/modules/update_test/lib/Drupal/update_test/MockFileTransfer.php b/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php similarity index 100% rename from core/modules/update/tests/modules/update_test/lib/Drupal/update_test/MockFileTransfer.php rename to core/modules/update/tests/modules/update_test/src/MockFileTransfer.php diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/src/Access/LoginStatusCheck.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php rename to core/modules/user/src/Access/LoginStatusCheck.php diff --git a/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php b/core/modules/user/src/Access/PermissionAccessCheck.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php rename to core/modules/user/src/Access/PermissionAccessCheck.php diff --git a/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php b/core/modules/user/src/Access/RegisterAccessCheck.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php rename to core/modules/user/src/Access/RegisterAccessCheck.php diff --git a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php b/core/modules/user/src/Access/RoleAccessCheck.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php rename to core/modules/user/src/Access/RoleAccessCheck.php diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/src/AccountFormController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/AccountFormController.php rename to core/modules/user/src/AccountFormController.php diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/src/AccountSettingsForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/AccountSettingsForm.php rename to core/modules/user/src/AccountSettingsForm.php diff --git a/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php b/core/modules/user/src/Controller/UserAutocompleteController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php rename to core/modules/user/src/Controller/UserAutocompleteController.php diff --git a/core/modules/user/lib/Drupal/user/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Controller/UserController.php rename to core/modules/user/src/Controller/UserController.php diff --git a/core/modules/user/lib/Drupal/user/Entity/Role.php b/core/modules/user/src/Entity/Role.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Entity/Role.php rename to core/modules/user/src/Entity/Role.php diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/src/Entity/User.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Entity/User.php rename to core/modules/user/src/Entity/User.php diff --git a/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php similarity index 100% rename from core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php rename to core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Form/UserLoginForm.php rename to core/modules/user/src/Form/UserLoginForm.php diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/src/Form/UserPasswordForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php rename to core/modules/user/src/Form/UserPasswordForm.php diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php rename to core/modules/user/src/Form/UserPermissionsForm.php diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php b/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php rename to core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php diff --git a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php b/core/modules/user/src/Form/UserRoleDelete.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php rename to core/modules/user/src/Form/UserRoleDelete.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php b/core/modules/user/src/Plugin/Action/AddRoleUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php rename to core/modules/user/src/Plugin/Action/AddRoleUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php b/core/modules/user/src/Plugin/Action/BlockUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php rename to core/modules/user/src/Plugin/Action/BlockUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php b/core/modules/user/src/Plugin/Action/CancelUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php rename to core/modules/user/src/Plugin/Action/CancelUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/ChangeUserRoleBase.php b/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/ChangeUserRoleBase.php rename to core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php b/core/modules/user/src/Plugin/Action/RemoveRoleUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php rename to core/modules/user/src/Plugin/Action/RemoveRoleUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php b/core/modules/user/src/Plugin/Action/UnblockUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php rename to core/modules/user/src/Plugin/Action/UnblockUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php rename to core/modules/user/src/Plugin/Block/UserLoginBlock.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/src/Plugin/Block/UserNewBlock.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php rename to core/modules/user/src/Plugin/Block/UserNewBlock.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/src/Plugin/Block/UserOnlineBlock.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php rename to core/modules/user/src/Plugin/Block/UserOnlineBlock.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php b/core/modules/user/src/Plugin/Search/UserSearch.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php rename to core/modules/user/src/Plugin/Search/UserSearch.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php b/core/modules/user/src/Plugin/Validation/Constraint/UserMailUnique.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php rename to core/modules/user/src/Plugin/Validation/Constraint/UserMailUnique.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php rename to core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraint.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraintValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraintValidator.php rename to core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameUnique.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php rename to core/modules/user/src/Plugin/Validation/Constraint/UserNameUnique.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserUniqueValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserUniqueValidator.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserUniqueValidator.php rename to core/modules/user/src/Plugin/Validation/Constraint/UserUniqueValidator.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php b/core/modules/user/src/Plugin/entity_reference/selection/UserSelection.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php rename to core/modules/user/src/Plugin/entity_reference/selection/UserSelection.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php b/core/modules/user/src/Plugin/views/access/Permission.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php rename to core/modules/user/src/Plugin/views/access/Permission.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php b/core/modules/user/src/Plugin/views/access/Role.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php rename to core/modules/user/src/Plugin/views/access/Role.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/src/Plugin/views/argument/RolesRid.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php rename to core/modules/user/src/Plugin/views/argument/RolesRid.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php b/core/modules/user/src/Plugin/views/argument/Uid.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php rename to core/modules/user/src/Plugin/views/argument/Uid.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php rename to core/modules/user/src/Plugin/views/argument_default/CurrentUser.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php b/core/modules/user/src/Plugin/views/argument_default/User.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php rename to core/modules/user/src/Plugin/views/argument_default/User.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php rename to core/modules/user/src/Plugin/views/argument_validator/User.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/src/Plugin/views/field/Language.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php rename to core/modules/user/src/Plugin/views/field/Language.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/src/Plugin/views/field/Link.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php rename to core/modules/user/src/Plugin/views/field/Link.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/src/Plugin/views/field/LinkCancel.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php rename to core/modules/user/src/Plugin/views/field/LinkCancel.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/src/Plugin/views/field/LinkEdit.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php rename to core/modules/user/src/Plugin/views/field/LinkEdit.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php b/core/modules/user/src/Plugin/views/field/Mail.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php rename to core/modules/user/src/Plugin/views/field/Mail.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/src/Plugin/views/field/Name.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php rename to core/modules/user/src/Plugin/views/field/Name.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/src/Plugin/views/field/Permissions.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php rename to core/modules/user/src/Plugin/views/field/Permissions.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/src/Plugin/views/field/Roles.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php rename to core/modules/user/src/Plugin/views/field/Roles.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/src/Plugin/views/field/User.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/User.php rename to core/modules/user/src/Plugin/views/field/User.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php b/core/modules/user/src/Plugin/views/field/UserBulkForm.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php rename to core/modules/user/src/Plugin/views/field/UserBulkForm.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/src/Plugin/views/field/UserData.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php rename to core/modules/user/src/Plugin/views/field/UserData.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php b/core/modules/user/src/Plugin/views/filter/Current.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php rename to core/modules/user/src/Plugin/views/filter/Current.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php rename to core/modules/user/src/Plugin/views/filter/Name.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/src/Plugin/views/filter/Permissions.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php rename to core/modules/user/src/Plugin/views/filter/Permissions.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/src/Plugin/views/filter/Roles.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php rename to core/modules/user/src/Plugin/views/filter/Roles.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php b/core/modules/user/src/Plugin/views/row/UserRow.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php rename to core/modules/user/src/Plugin/views/row/UserRow.php diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php b/core/modules/user/src/Plugin/views/wizard/Users.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php rename to core/modules/user/src/Plugin/views/wizard/Users.php diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/src/ProfileFormController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/ProfileFormController.php rename to core/modules/user/src/ProfileFormController.php diff --git a/core/modules/user/lib/Drupal/user/ProfileTranslationController.php b/core/modules/user/src/ProfileTranslationController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/ProfileTranslationController.php rename to core/modules/user/src/ProfileTranslationController.php diff --git a/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/src/RegisterFormController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RegisterFormController.php rename to core/modules/user/src/RegisterFormController.php diff --git a/core/modules/user/lib/Drupal/user/RoleAccessController.php b/core/modules/user/src/RoleAccessController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleAccessController.php rename to core/modules/user/src/RoleAccessController.php diff --git a/core/modules/user/lib/Drupal/user/RoleFormController.php b/core/modules/user/src/RoleFormController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleFormController.php rename to core/modules/user/src/RoleFormController.php diff --git a/core/modules/user/lib/Drupal/user/RoleInterface.php b/core/modules/user/src/RoleInterface.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleInterface.php rename to core/modules/user/src/RoleInterface.php diff --git a/core/modules/user/lib/Drupal/user/RoleListController.php b/core/modules/user/src/RoleListController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleListController.php rename to core/modules/user/src/RoleListController.php diff --git a/core/modules/user/lib/Drupal/user/RoleStorageController.php b/core/modules/user/src/RoleStorageController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleStorageController.php rename to core/modules/user/src/RoleStorageController.php diff --git a/core/modules/user/lib/Drupal/user/RoleStorageControllerInterface.php b/core/modules/user/src/RoleStorageControllerInterface.php similarity index 100% rename from core/modules/user/lib/Drupal/user/RoleStorageControllerInterface.php rename to core/modules/user/src/RoleStorageControllerInterface.php diff --git a/core/modules/user/lib/Drupal/user/TempStore.php b/core/modules/user/src/TempStore.php similarity index 100% rename from core/modules/user/lib/Drupal/user/TempStore.php rename to core/modules/user/src/TempStore.php diff --git a/core/modules/user/lib/Drupal/user/TempStoreException.php b/core/modules/user/src/TempStoreException.php similarity index 100% rename from core/modules/user/lib/Drupal/user/TempStoreException.php rename to core/modules/user/src/TempStoreException.php diff --git a/core/modules/user/lib/Drupal/user/TempStoreFactory.php b/core/modules/user/src/TempStoreFactory.php similarity index 100% rename from core/modules/user/lib/Drupal/user/TempStoreFactory.php rename to core/modules/user/src/TempStoreFactory.php diff --git a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php b/core/modules/user/src/Tests/TempStoreDatabaseTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php rename to core/modules/user/src/Tests/TempStoreDatabaseTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/src/Tests/UserAccountLinksTests.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php rename to core/modules/user/src/Tests/UserAccountLinksTests.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminListingTest.php b/core/modules/user/src/Tests/UserAdminListingTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserAdminListingTest.php rename to core/modules/user/src/Tests/UserAdminListingTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php rename to core/modules/user/src/Tests/UserAdminSettingsFormTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/src/Tests/UserAdminTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php rename to core/modules/user/src/Tests/UserAdminTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php b/core/modules/user/src/Tests/UserAutocompleteTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php rename to core/modules/user/src/Tests/UserAutocompleteTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/src/Tests/UserBlocksTests.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php rename to core/modules/user/src/Tests/UserBlocksTests.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php rename to core/modules/user/src/Tests/UserCancelTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateFailMailTest.php b/core/modules/user/src/Tests/UserCreateFailMailTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserCreateFailMailTest.php rename to core/modules/user/src/Tests/UserCreateFailMailTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php rename to core/modules/user/src/Tests/UserCreateTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php b/core/modules/user/src/Tests/UserDeleteTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php rename to core/modules/user/src/Tests/UserDeleteTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php b/core/modules/user/src/Tests/UserEditTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserEditTest.php rename to core/modules/user/src/Tests/UserEditTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php b/core/modules/user/src/Tests/UserEditedOwnAccountTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php rename to core/modules/user/src/Tests/UserEditedOwnAccountTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php b/core/modules/user/src/Tests/UserEntityCallbacksTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php rename to core/modules/user/src/Tests/UserEntityCallbacksTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php b/core/modules/user/src/Tests/UserEntityTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php rename to core/modules/user/src/Tests/UserEntityTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php b/core/modules/user/src/Tests/UserLanguageCreationTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php rename to core/modules/user/src/Tests/UserLanguageCreationTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php b/core/modules/user/src/Tests/UserLanguageTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php rename to core/modules/user/src/Tests/UserLanguageTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php rename to core/modules/user/src/Tests/UserLoginTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php rename to core/modules/user/src/Tests/UserPasswordResetTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/src/Tests/UserPermissionsTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php rename to core/modules/user/src/Tests/UserPermissionsTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php rename to core/modules/user/src/Tests/UserPictureTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php rename to core/modules/user/src/Tests/UserRegistrationTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/src/Tests/UserRoleAdminTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php rename to core/modules/user/src/Tests/UserRoleAdminTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php b/core/modules/user/src/Tests/UserRolesAssignmentTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php rename to core/modules/user/src/Tests/UserRolesAssignmentTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSaveTest.php b/core/modules/user/src/Tests/UserSaveTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserSaveTest.php rename to core/modules/user/src/Tests/UserSaveTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSearchTest.php b/core/modules/user/src/Tests/UserSearchTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserSearchTest.php rename to core/modules/user/src/Tests/UserSearchTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php b/core/modules/user/src/Tests/UserSignatureTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php rename to core/modules/user/src/Tests/UserSignatureTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php b/core/modules/user/src/Tests/UserTimeZoneTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php rename to core/modules/user/src/Tests/UserTimeZoneTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php rename to core/modules/user/src/Tests/UserTokenReplaceTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php b/core/modules/user/src/Tests/UserTranslationUITest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php rename to core/modules/user/src/Tests/UserTranslationUITest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php b/core/modules/user/src/Tests/UserValidateCurrentPassCustomFormTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php rename to core/modules/user/src/Tests/UserValidateCurrentPassCustomFormTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php rename to core/modules/user/src/Tests/UserValidationTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php b/core/modules/user/src/Tests/Views/AccessPermissionTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php rename to core/modules/user/src/Tests/Views/AccessPermissionTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php b/core/modules/user/src/Tests/Views/AccessRoleTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php rename to core/modules/user/src/Tests/Views/AccessRoleTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessTestBase.php b/core/modules/user/src/Tests/Views/AccessTestBase.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessTestBase.php rename to core/modules/user/src/Tests/Views/AccessTestBase.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php b/core/modules/user/src/Tests/Views/ArgumentDefaultTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php rename to core/modules/user/src/Tests/Views/ArgumentDefaultTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php b/core/modules/user/src/Tests/Views/ArgumentValidateTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php rename to core/modules/user/src/Tests/Views/ArgumentValidateTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php b/core/modules/user/src/Tests/Views/BulkFormTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php rename to core/modules/user/src/Tests/Views/BulkFormTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php b/core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php rename to core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php rename to core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php rename to core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php rename to core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php rename to core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php rename to core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/src/Tests/Views/RelationshipRepresentativeNode.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php rename to core/modules/user/src/Tests/Views/RelationshipRepresentativeNode.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php b/core/modules/user/src/Tests/Views/UserDataTest.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php rename to core/modules/user/src/Tests/Views/UserDataTest.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php b/core/modules/user/src/Tests/Views/UserTestBase.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php rename to core/modules/user/src/Tests/Views/UserTestBase.php diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php b/core/modules/user/src/Tests/Views/UserUnitTestBase.php similarity index 100% rename from core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php rename to core/modules/user/src/Tests/Views/UserUnitTestBase.php diff --git a/core/modules/user/lib/Drupal/user/UserAccessController.php b/core/modules/user/src/UserAccessController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserAccessController.php rename to core/modules/user/src/UserAccessController.php diff --git a/core/modules/user/lib/Drupal/user/UserAutocomplete.php b/core/modules/user/src/UserAutocomplete.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserAutocomplete.php rename to core/modules/user/src/UserAutocomplete.php diff --git a/core/modules/user/lib/Drupal/user/UserConfigContext.php b/core/modules/user/src/UserConfigContext.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserConfigContext.php rename to core/modules/user/src/UserConfigContext.php diff --git a/core/modules/user/lib/Drupal/user/UserData.php b/core/modules/user/src/UserData.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserData.php rename to core/modules/user/src/UserData.php diff --git a/core/modules/user/lib/Drupal/user/UserDataInterface.php b/core/modules/user/src/UserDataInterface.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserDataInterface.php rename to core/modules/user/src/UserDataInterface.php diff --git a/core/modules/user/lib/Drupal/user/UserInterface.php b/core/modules/user/src/UserInterface.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserInterface.php rename to core/modules/user/src/UserInterface.php diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/src/UserStorageController.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserStorageController.php rename to core/modules/user/src/UserStorageController.php diff --git a/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php b/core/modules/user/src/UserStorageControllerInterface.php similarity index 100% rename from core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php rename to core/modules/user/src/UserStorageControllerInterface.php diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php b/core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php similarity index 100% rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php rename to core/modules/user/tests/src/Plugin/Action/AddRoleUserTest.php diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php b/core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php similarity index 100% rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php rename to core/modules/user/tests/src/Plugin/Action/RemoveRoleUserTest.php diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php b/core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php similarity index 100% rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php rename to core/modules/user/tests/src/Plugin/Core/Entity/UserTest.php diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php similarity index 100% rename from core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php rename to core/modules/user/tests/src/Plugin/views/field/UserBulkFormTest.php diff --git a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php b/core/modules/user/tests/src/Views/Argument/RolesRidTest.php similarity index 100% rename from core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php rename to core/modules/user/tests/src/Views/Argument/RolesRidTest.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/DismissFormCommand.php b/core/modules/views/src/Ajax/DismissFormCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/DismissFormCommand.php rename to core/modules/views/src/Ajax/DismissFormCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/HighlightCommand.php b/core/modules/views/src/Ajax/HighlightCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/HighlightCommand.php rename to core/modules/views/src/Ajax/HighlightCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/ReplaceTitleCommand.php b/core/modules/views/src/Ajax/ReplaceTitleCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/ReplaceTitleCommand.php rename to core/modules/views/src/Ajax/ReplaceTitleCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/ScrollTopCommand.php b/core/modules/views/src/Ajax/ScrollTopCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/ScrollTopCommand.php rename to core/modules/views/src/Ajax/ScrollTopCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/SetFormCommand.php b/core/modules/views/src/Ajax/SetFormCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/SetFormCommand.php rename to core/modules/views/src/Ajax/SetFormCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/ShowButtonsCommand.php b/core/modules/views/src/Ajax/ShowButtonsCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/ShowButtonsCommand.php rename to core/modules/views/src/Ajax/ShowButtonsCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/TriggerPreviewCommand.php b/core/modules/views/src/Ajax/TriggerPreviewCommand.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/TriggerPreviewCommand.php rename to core/modules/views/src/Ajax/TriggerPreviewCommand.php diff --git a/core/modules/views/lib/Drupal/views/Ajax/ViewAjaxResponse.php b/core/modules/views/src/Ajax/ViewAjaxResponse.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Ajax/ViewAjaxResponse.php rename to core/modules/views/src/Ajax/ViewAjaxResponse.php diff --git a/core/modules/views/lib/Drupal/views/Analyzer.php b/core/modules/views/src/Analyzer.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Analyzer.php rename to core/modules/views/src/Analyzer.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsAccess.php b/core/modules/views/src/Annotation/ViewsAccess.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsAccess.php rename to core/modules/views/src/Annotation/ViewsAccess.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentDefault.php b/core/modules/views/src/Annotation/ViewsArgumentDefault.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentDefault.php rename to core/modules/views/src/Annotation/ViewsArgumentDefault.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentValidator.php b/core/modules/views/src/Annotation/ViewsArgumentValidator.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentValidator.php rename to core/modules/views/src/Annotation/ViewsArgumentValidator.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsCache.php b/core/modules/views/src/Annotation/ViewsCache.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsCache.php rename to core/modules/views/src/Annotation/ViewsCache.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsDisplay.php b/core/modules/views/src/Annotation/ViewsDisplay.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsDisplay.php rename to core/modules/views/src/Annotation/ViewsDisplay.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsDisplayExtender.php b/core/modules/views/src/Annotation/ViewsDisplayExtender.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsDisplayExtender.php rename to core/modules/views/src/Annotation/ViewsDisplayExtender.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsExposedForm.php b/core/modules/views/src/Annotation/ViewsExposedForm.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsExposedForm.php rename to core/modules/views/src/Annotation/ViewsExposedForm.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsPager.php b/core/modules/views/src/Annotation/ViewsPager.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsPager.php rename to core/modules/views/src/Annotation/ViewsPager.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsPluginAnnotationBase.php b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsPluginAnnotationBase.php rename to core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsQuery.php b/core/modules/views/src/Annotation/ViewsQuery.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsQuery.php rename to core/modules/views/src/Annotation/ViewsQuery.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsRow.php b/core/modules/views/src/Annotation/ViewsRow.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsRow.php rename to core/modules/views/src/Annotation/ViewsRow.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsStyle.php b/core/modules/views/src/Annotation/ViewsStyle.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsStyle.php rename to core/modules/views/src/Annotation/ViewsStyle.php diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsWizard.php b/core/modules/views/src/Annotation/ViewsWizard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Annotation/ViewsWizard.php rename to core/modules/views/src/Annotation/ViewsWizard.php diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php rename to core/modules/views/src/Controller/ViewAjaxController.php diff --git a/core/modules/views/lib/Drupal/views/DisplayBag.php b/core/modules/views/src/DisplayBag.php similarity index 100% rename from core/modules/views/lib/Drupal/views/DisplayBag.php rename to core/modules/views/src/DisplayBag.php diff --git a/core/modules/views/lib/Drupal/views/Entity/View.php b/core/modules/views/src/Entity/View.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Entity/View.php rename to core/modules/views/src/Entity/View.php diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/src/EventSubscriber/RouteSubscriber.php similarity index 100% rename from core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php rename to core/modules/views/src/EventSubscriber/RouteSubscriber.php diff --git a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ManyToOneHelper.php rename to core/modules/views/src/ManyToOneHelper.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php rename to core/modules/views/src/Plugin/Block/ViewsBlock.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php rename to core/modules/views/src/Plugin/Block/ViewsBlockBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php rename to core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php rename to core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php rename to core/modules/views/src/Plugin/Derivative/ViewsBlock.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php rename to core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php rename to core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php b/core/modules/views/src/Plugin/Discovery/ViewsHandlerDiscovery.php similarity index 54% rename from core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php rename to core/modules/views/src/Plugin/Discovery/ViewsHandlerDiscovery.php index 460ef5a..c9a15ef 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php +++ b/core/modules/views/src/Plugin/Discovery/ViewsHandlerDiscovery.php @@ -22,13 +22,6 @@ class ViewsHandlerDiscovery extends AnnotatedClassDiscovery { protected $type; /** - * An object containing the namespaces to look for plugin implementations. - * - * @var \Traversable - */ - protected $rootNamespacesIterator; - - /** * Constructs a ViewsHandlerDiscovery object. * * @param string $type @@ -39,19 +32,9 @@ class ViewsHandlerDiscovery extends AnnotatedClassDiscovery { */ function __construct($type, \Traversable $root_namespaces) { $this->type = $type; - $this->rootNamespacesIterator = $root_namespaces; - $annotation_namespaces = array( - 'Drupal\Component\Annotation' => DRUPAL_ROOT . '/core/lib', - ); - $plugin_namespaces = array(); - foreach ($root_namespaces as $namespace => $dir) { - $plugin_namespaces["$namespace\\Plugin\\views\\{$type}"] = array($dir); - } - - $this->pluginNamespaces = $plugin_namespaces; - $this->annotationNamespaces = $annotation_namespaces; - $this->pluginDefinitionAnnotationName = 'Drupal\Component\Annotation\PluginID'; + parent::__construct($root_namespaces, 'Plugin\views\\' . $type, 'Drupal\Component\Annotation\PluginID'); + unset($this->annotationNamespaces['Drupal\Core\Annotation']); } /** @@ -66,16 +49,4 @@ public function getDefinitions() { return $definitions; } - /** - * {@inheritdoc} - */ - protected function getPluginNamespaces() { - $plugin_namespaces = array(); - foreach ($this->rootNamespacesIterator as $namespace => $dir) { - $plugin_namespaces["$namespace\\Plugin\\views\\{$this->type}"] = array($dir); - } - - return $plugin_namespaces; - } - } diff --git a/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php b/core/modules/views/src/Plugin/ViewsHandlerManager.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php rename to core/modules/views/src/Plugin/ViewsHandlerManager.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php b/core/modules/views/src/Plugin/ViewsPluginManager.php similarity index 88% rename from core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php rename to core/modules/views/src/Plugin/ViewsPluginManager.php index d603fba..4404bf5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php +++ b/core/modules/views/src/Plugin/ViewsPluginManager.php @@ -34,9 +34,9 @@ class ViewsPluginManager extends DefaultPluginManager { * The module handler to invoke the alter hook with. */ public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) { - $annotation_namespaces = array('Drupal\views\Annotation' => $namespaces['Drupal\views']); $plugin_definition_annotation_name = 'Drupal\views\Annotation\Views' . Container::camelize($type); - parent::__construct("Plugin/views/$type", $namespaces, $annotation_namespaces, $plugin_definition_annotation_name); + parent::__construct($namespaces, "Plugin\\views\\$type", $plugin_definition_annotation_name); + $this->addAnnotationNamespace('Drupal\views\Annotation'); $this->defaults += array( 'parent' => 'parent', diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/src/Plugin/entity_reference/selection/ViewsSelection.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php rename to core/modules/views/src/Plugin/entity_reference/selection/ViewsSelection.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php rename to core/modules/views/src/Plugin/views/HandlerBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php rename to core/modules/views/src/Plugin/views/PluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginInterface.php b/core/modules/views/src/Plugin/views/PluginInterface.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/PluginInterface.php rename to core/modules/views/src/Plugin/views/PluginInterface.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php rename to core/modules/views/src/Plugin/views/access/AccessPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php b/core/modules/views/src/Plugin/views/access/None.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/access/None.php rename to core/modules/views/src/Plugin/views/access/None.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php rename to core/modules/views/src/Plugin/views/area/AreaPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php b/core/modules/views/src/Plugin/views/area/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php rename to core/modules/views/src/Plugin/views/area/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php b/core/modules/views/src/Plugin/views/area/Entity.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php rename to core/modules/views/src/Plugin/views/area/Entity.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php b/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php rename to core/modules/views/src/Plugin/views/area/HTTPStatusCode.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php rename to core/modules/views/src/Plugin/views/area/Result.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php b/core/modules/views/src/Plugin/views/area/Text.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php rename to core/modules/views/src/Plugin/views/area/Text.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php b/core/modules/views/src/Plugin/views/area/TextCustom.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php rename to core/modules/views/src/Plugin/views/area/TextCustom.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php b/core/modules/views/src/Plugin/views/area/Title.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php rename to core/modules/views/src/Plugin/views/area/Title.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TokenizeAreaPluginBase.php b/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/TokenizeAreaPluginBase.php rename to core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/src/Plugin/views/area/View.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/area/View.php rename to core/modules/views/src/Plugin/views/area/View.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php rename to core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php b/core/modules/views/src/Plugin/views/argument/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php rename to core/modules/views/src/Plugin/views/argument/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php rename to core/modules/views/src/Plugin/views/argument/Date.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php b/core/modules/views/src/Plugin/views/argument/DayDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php rename to core/modules/views/src/Plugin/views/argument/DayDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/src/Plugin/views/argument/Formula.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php rename to core/modules/views/src/Plugin/views/argument/Formula.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php b/core/modules/views/src/Plugin/views/argument/FullDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php rename to core/modules/views/src/Plugin/views/argument/FullDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php rename to core/modules/views/src/Plugin/views/argument/GroupByNumeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/src/Plugin/views/argument/ManyToOne.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php rename to core/modules/views/src/Plugin/views/argument/ManyToOne.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php b/core/modules/views/src/Plugin/views/argument/MonthDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php rename to core/modules/views/src/Plugin/views/argument/MonthDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/src/Plugin/views/argument/Null.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php rename to core/modules/views/src/Plugin/views/argument/Null.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/src/Plugin/views/argument/Numeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php rename to core/modules/views/src/Plugin/views/argument/Numeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php b/core/modules/views/src/Plugin/views/argument/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php rename to core/modules/views/src/Plugin/views/argument/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/src/Plugin/views/argument/String.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php rename to core/modules/views/src/Plugin/views/argument/String.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php b/core/modules/views/src/Plugin/views/argument/WeekDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php rename to core/modules/views/src/Plugin/views/argument/WeekDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php b/core/modules/views/src/Plugin/views/argument/YearDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php rename to core/modules/views/src/Plugin/views/argument/YearDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php b/core/modules/views/src/Plugin/views/argument/YearMonthDate.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php rename to core/modules/views/src/Plugin/views/argument/YearMonthDate.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php rename to core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php b/core/modules/views/src/Plugin/views/argument_default/Fixed.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php rename to core/modules/views/src/Plugin/views/argument_default/Fixed.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php b/core/modules/views/src/Plugin/views/argument_default/Raw.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php rename to core/modules/views/src/Plugin/views/argument_default/Raw.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php rename to core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php b/core/modules/views/src/Plugin/views/argument_validator/None.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php rename to core/modules/views/src/Plugin/views/argument_validator/None.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/core/modules/views/src/Plugin/views/argument_validator/Numeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php rename to core/modules/views/src/Plugin/views/argument_validator/Numeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php rename to core/modules/views/src/Plugin/views/cache/CachePluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php b/core/modules/views/src/Plugin/views/cache/None.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php rename to core/modules/views/src/Plugin/views/cache/None.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php b/core/modules/views/src/Plugin/views/cache/Time.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php rename to core/modules/views/src/Plugin/views/cache/Time.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php b/core/modules/views/src/Plugin/views/display/Attachment.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php rename to core/modules/views/src/Plugin/views/display/Attachment.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php rename to core/modules/views/src/Plugin/views/display/DefaultDisplay.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php rename to core/modules/views/src/Plugin/views/display/DisplayPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php b/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php rename to core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php b/core/modules/views/src/Plugin/views/display/Embed.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php rename to core/modules/views/src/Plugin/views/display/Embed.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/src/Plugin/views/display/Feed.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php rename to core/modules/views/src/Plugin/views/display/Feed.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php rename to core/modules/views/src/Plugin/views/display/Page.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php rename to core/modules/views/src/Plugin/views/display/PathPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php rename to core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php rename to core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php b/core/modules/views/src/Plugin/views/exposed_form/Basic.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php rename to core/modules/views/src/Plugin/views/exposed_form/Basic.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php rename to core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php rename to core/modules/views/src/Plugin/views/exposed_form/InputRequired.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php b/core/modules/views/src/Plugin/views/field/ActionBulkForm.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php rename to core/modules/views/src/Plugin/views/field/ActionBulkForm.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/src/Plugin/views/field/Boolean.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php rename to core/modules/views/src/Plugin/views/field/Boolean.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php b/core/modules/views/src/Plugin/views/field/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php rename to core/modules/views/src/Plugin/views/field/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/src/Plugin/views/field/Counter.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php rename to core/modules/views/src/Plugin/views/field/Counter.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/src/Plugin/views/field/Custom.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php rename to core/modules/views/src/Plugin/views/field/Custom.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/src/Plugin/views/field/Date.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php rename to core/modules/views/src/Plugin/views/field/Date.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php b/core/modules/views/src/Plugin/views/field/Dropbutton.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php rename to core/modules/views/src/Plugin/views/field/Dropbutton.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/src/Plugin/views/field/EntityLabel.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php rename to core/modules/views/src/Plugin/views/field/EntityLabel.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php rename to core/modules/views/src/Plugin/views/field/FieldPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/src/Plugin/views/field/FileSize.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php rename to core/modules/views/src/Plugin/views/field/FileSize.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Links.php b/core/modules/views/src/Plugin/views/field/Links.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Links.php rename to core/modules/views/src/Plugin/views/field/Links.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php rename to core/modules/views/src/Plugin/views/field/MachineName.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/src/Plugin/views/field/Markup.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php rename to core/modules/views/src/Plugin/views/field/Markup.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/src/Plugin/views/field/Numeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php rename to core/modules/views/src/Plugin/views/field/Numeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/src/Plugin/views/field/PrerenderList.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php rename to core/modules/views/src/Plugin/views/field/PrerenderList.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/src/Plugin/views/field/Serialized.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php rename to core/modules/views/src/Plugin/views/field/Serialized.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php b/core/modules/views/src/Plugin/views/field/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php rename to core/modules/views/src/Plugin/views/field/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/src/Plugin/views/field/TimeInterval.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php rename to core/modules/views/src/Plugin/views/field/TimeInterval.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/src/Plugin/views/field/Url.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php rename to core/modules/views/src/Plugin/views/field/Url.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/src/Plugin/views/field/Xss.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php rename to core/modules/views/src/Plugin/views/field/Xss.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php rename to core/modules/views/src/Plugin/views/filter/BooleanOperator.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php rename to core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php b/core/modules/views/src/Plugin/views/filter/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php rename to core/modules/views/src/Plugin/views/filter/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/src/Plugin/views/filter/Bundle.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php rename to core/modules/views/src/Plugin/views/filter/Bundle.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php rename to core/modules/views/src/Plugin/views/filter/Combine.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php rename to core/modules/views/src/Plugin/views/filter/Date.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/src/Plugin/views/filter/Equality.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php rename to core/modules/views/src/Plugin/views/filter/Equality.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php rename to core/modules/views/src/Plugin/views/filter/FilterPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php rename to core/modules/views/src/Plugin/views/filter/GroupByNumeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php rename to core/modules/views/src/Plugin/views/filter/InOperator.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/src/Plugin/views/filter/ManyToOne.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php rename to core/modules/views/src/Plugin/views/filter/ManyToOne.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/src/Plugin/views/filter/Numeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php rename to core/modules/views/src/Plugin/views/filter/Numeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php b/core/modules/views/src/Plugin/views/filter/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php rename to core/modules/views/src/Plugin/views/filter/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/src/Plugin/views/filter/String.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php rename to core/modules/views/src/Plugin/views/filter/String.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php rename to core/modules/views/src/Plugin/views/join/JoinPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php b/core/modules/views/src/Plugin/views/join/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php rename to core/modules/views/src/Plugin/views/join/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php b/core/modules/views/src/Plugin/views/join/Subquery.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php rename to core/modules/views/src/Plugin/views/join/Subquery.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php b/core/modules/views/src/Plugin/views/pager/Full.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php rename to core/modules/views/src/Plugin/views/pager/Full.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/src/Plugin/views/pager/Mini.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php rename to core/modules/views/src/Plugin/views/pager/Mini.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php b/core/modules/views/src/Plugin/views/pager/None.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php rename to core/modules/views/src/Plugin/views/pager/None.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php rename to core/modules/views/src/Plugin/views/pager/PagerPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php b/core/modules/views/src/Plugin/views/pager/Some.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php rename to core/modules/views/src/Plugin/views/pager/Some.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/src/Plugin/views/pager/SqlBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php rename to core/modules/views/src/Plugin/views/pager/SqlBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryInterface.php b/core/modules/views/src/Plugin/views/query/QueryInterface.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/query/QueryInterface.php rename to core/modules/views/src/Plugin/views/query/QueryInterface.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php rename to core/modules/views/src/Plugin/views/query/QueryPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php rename to core/modules/views/src/Plugin/views/query/Sql.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php b/core/modules/views/src/Plugin/views/relationship/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php rename to core/modules/views/src/Plugin/views/relationship/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php rename to core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php rename to core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php b/core/modules/views/src/Plugin/views/relationship/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php rename to core/modules/views/src/Plugin/views/relationship/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php rename to core/modules/views/src/Plugin/views/row/EntityRow.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php b/core/modules/views/src/Plugin/views/row/Fields.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php rename to core/modules/views/src/Plugin/views/row/Fields.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/core/modules/views/src/Plugin/views/row/RowPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php rename to core/modules/views/src/Plugin/views/row/RowPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php b/core/modules/views/src/Plugin/views/row/RssFields.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php rename to core/modules/views/src/Plugin/views/row/RssFields.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php b/core/modules/views/src/Plugin/views/sort/Broken.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php rename to core/modules/views/src/Plugin/views/sort/Broken.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php b/core/modules/views/src/Plugin/views/sort/Date.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php rename to core/modules/views/src/Plugin/views/sort/Date.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php rename to core/modules/views/src/Plugin/views/sort/GroupByNumeric.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/src/Plugin/views/sort/MenuHierarchy.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php rename to core/modules/views/src/Plugin/views/sort/MenuHierarchy.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php b/core/modules/views/src/Plugin/views/sort/Random.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php rename to core/modules/views/src/Plugin/views/sort/Random.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php rename to core/modules/views/src/Plugin/views/sort/SortPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php b/core/modules/views/src/Plugin/views/sort/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php rename to core/modules/views/src/Plugin/views/sort/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/core/modules/views/src/Plugin/views/style/DefaultStyle.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php rename to core/modules/views/src/Plugin/views/style/DefaultStyle.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/core/modules/views/src/Plugin/views/style/DefaultSummary.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php rename to core/modules/views/src/Plugin/views/style/DefaultSummary.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php b/core/modules/views/src/Plugin/views/style/Grid.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php rename to core/modules/views/src/Plugin/views/style/Grid.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php b/core/modules/views/src/Plugin/views/style/HtmlList.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php rename to core/modules/views/src/Plugin/views/style/HtmlList.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Mapping.php b/core/modules/views/src/Plugin/views/style/Mapping.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Mapping.php rename to core/modules/views/src/Plugin/views/style/Mapping.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php b/core/modules/views/src/Plugin/views/style/Rss.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php rename to core/modules/views/src/Plugin/views/style/Rss.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php rename to core/modules/views/src/Plugin/views/style/StylePluginBase.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php rename to core/modules/views/src/Plugin/views/style/Table.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php b/core/modules/views/src/Plugin/views/style/UnformattedSummary.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php rename to core/modules/views/src/Plugin/views/style/UnformattedSummary.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php b/core/modules/views/src/Plugin/views/wizard/Standard.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php rename to core/modules/views/src/Plugin/views/wizard/Standard.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardException.php b/core/modules/views/src/Plugin/views/wizard/WizardException.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardException.php rename to core/modules/views/src/Plugin/views/wizard/WizardException.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php b/core/modules/views/src/Plugin/views/wizard/WizardInterface.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php rename to core/modules/views/src/Plugin/views/wizard/WizardInterface.php diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php rename to core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php diff --git a/core/modules/views/lib/Drupal/views/ResultRow.php b/core/modules/views/src/ResultRow.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ResultRow.php rename to core/modules/views/src/ResultRow.php diff --git a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Routing/ViewPageController.php rename to core/modules/views/src/Routing/ViewPageController.php diff --git a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php b/core/modules/views/src/Tests/BasicTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/BasicTest.php rename to core/modules/views/src/Tests/BasicTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php rename to core/modules/views/src/Tests/DefaultViewsTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/src/Tests/Entity/FieldEntityTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php rename to core/modules/views/src/Tests/Entity/FieldEntityTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php rename to core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php b/core/modules/views/src/Tests/GlossaryTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php rename to core/modules/views/src/Tests/GlossaryTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php rename to core/modules/views/src/Tests/Handler/AreaEntityTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php b/core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php rename to core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php b/core/modules/views/src/Tests/Handler/AreaTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php rename to core/modules/views/src/Tests/Handler/AreaTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/src/Tests/Handler/AreaTextTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php rename to core/modules/views/src/Tests/Handler/AreaTextTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php b/core/modules/views/src/Tests/Handler/AreaTitleTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php rename to core/modules/views/src/Tests/Handler/AreaTitleTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php b/core/modules/views/src/Tests/Handler/ArgumentDateTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php rename to core/modules/views/src/Tests/Handler/ArgumentDateTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php rename to core/modules/views/src/Tests/Handler/ArgumentNullTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/core/modules/views/src/Tests/Handler/ArgumentStringTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php rename to core/modules/views/src/Tests/Handler/ArgumentStringTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php rename to core/modules/views/src/Tests/Handler/FieldBooleanTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php rename to core/modules/views/src/Tests/Handler/FieldCounterTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/core/modules/views/src/Tests/Handler/FieldCustomTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php rename to core/modules/views/src/Tests/Handler/FieldCustomTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/core/modules/views/src/Tests/Handler/FieldDateTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php rename to core/modules/views/src/Tests/Handler/FieldDateTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php b/core/modules/views/src/Tests/Handler/FieldDropButtonTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php rename to core/modules/views/src/Tests/Handler/FieldDropButtonTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php rename to core/modules/views/src/Tests/Handler/FieldFileSizeTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/src/Tests/Handler/FieldUnitTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php rename to core/modules/views/src/Tests/Handler/FieldUnitTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/core/modules/views/src/Tests/Handler/FieldUrlTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php rename to core/modules/views/src/Tests/Handler/FieldUrlTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php rename to core/modules/views/src/Tests/Handler/FieldWebTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/core/modules/views/src/Tests/Handler/FieldXssTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php rename to core/modules/views/src/Tests/Handler/FieldXssTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorStringTest.php rename to core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php rename to core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/core/modules/views/src/Tests/Handler/FilterCombineTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php rename to core/modules/views/src/Tests/Handler/FilterCombineTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/core/modules/views/src/Tests/Handler/FilterDateTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php rename to core/modules/views/src/Tests/Handler/FilterDateTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php rename to core/modules/views/src/Tests/Handler/FilterEqualityTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php rename to core/modules/views/src/Tests/Handler/FilterInOperatorTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/core/modules/views/src/Tests/Handler/FilterNumericTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php rename to core/modules/views/src/Tests/Handler/FilterNumericTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php rename to core/modules/views/src/Tests/Handler/FilterStringTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php rename to core/modules/views/src/Tests/Handler/HandlerAliasTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php rename to core/modules/views/src/Tests/Handler/HandlerAllTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/src/Tests/Handler/HandlerTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php rename to core/modules/views/src/Tests/Handler/HandlerTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTestBase.php b/core/modules/views/src/Tests/Handler/HandlerTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTestBase.php rename to core/modules/views/src/Tests/Handler/HandlerTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php b/core/modules/views/src/Tests/Handler/RelationshipTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php rename to core/modules/views/src/Tests/Handler/RelationshipTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php rename to core/modules/views/src/Tests/Handler/SortDateTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/core/modules/views/src/Tests/Handler/SortRandomTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php rename to core/modules/views/src/Tests/Handler/SortRandomTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php b/core/modules/views/src/Tests/Handler/SortTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php rename to core/modules/views/src/Tests/Handler/SortTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ModuleTest.php rename to core/modules/views/src/Tests/ModuleTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php b/core/modules/views/src/Tests/Plugin/AccessTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php rename to core/modules/views/src/Tests/Plugin/AccessTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php rename to core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php rename to core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php rename to core/modules/views/src/Tests/Plugin/CacheTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayAttachmentTest.php b/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayAttachmentTest.php rename to core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php b/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php rename to core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php rename to core/modules/views/src/Tests/Plugin/DisplayFeedTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php rename to core/modules/views/src/Tests/Plugin/DisplayPageTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageWebTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageWebTest.php rename to core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php rename to core/modules/views/src/Tests/Plugin/DisplayTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php b/core/modules/views/src/Tests/Plugin/DisplayUnitTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php rename to core/modules/views/src/Tests/Plugin/DisplayUnitTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php rename to core/modules/views/src/Tests/Plugin/ExposedFormTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php b/core/modules/views/src/Tests/Plugin/FilterTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php rename to core/modules/views/src/Tests/Plugin/FilterTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php b/core/modules/views/src/Tests/Plugin/JoinTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php rename to core/modules/views/src/Tests/Plugin/JoinTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php b/core/modules/views/src/Tests/Plugin/MiniPagerTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php rename to core/modules/views/src/Tests/Plugin/MiniPagerTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php rename to core/modules/views/src/Tests/Plugin/PagerTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PluginTestBase.php b/core/modules/views/src/Tests/Plugin/PluginTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PluginTestBase.php rename to core/modules/views/src/Tests/Plugin/PluginTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PluginUnitTestBase.php b/core/modules/views/src/Tests/Plugin/PluginUnitTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PluginUnitTestBase.php rename to core/modules/views/src/Tests/Plugin/PluginUnitTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php b/core/modules/views/src/Tests/Plugin/QueryTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php rename to core/modules/views/src/Tests/Plugin/QueryTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php rename to core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php b/core/modules/views/src/Tests/Plugin/RowEntityTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php rename to core/modules/views/src/Tests/Plugin/RowEntityTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php b/core/modules/views/src/Tests/Plugin/StyleGridTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php rename to core/modules/views/src/Tests/Plugin/StyleGridTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php rename to core/modules/views/src/Tests/Plugin/StyleMappingTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableTest.php b/core/modules/views/src/Tests/Plugin/StyleTableTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableTest.php rename to core/modules/views/src/Tests/Plugin/StyleTableTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php rename to core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/src/Tests/Plugin/StyleTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php rename to core/modules/views/src/Tests/Plugin/StyleTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php b/core/modules/views/src/Tests/Plugin/StyleTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php rename to core/modules/views/src/Tests/Plugin/StyleTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php rename to core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php b/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php rename to core/modules/views/src/Tests/Plugin/ViewsBlockTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php rename to core/modules/views/src/Tests/PluginInstanceTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php b/core/modules/views/src/Tests/QueryGroupByTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php rename to core/modules/views/src/Tests/QueryGroupByTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/TestHelperPlugin.php b/core/modules/views/src/Tests/TestHelperPlugin.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/TestHelperPlugin.php rename to core/modules/views/src/Tests/TestHelperPlugin.php diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php rename to core/modules/views/src/Tests/TokenReplaceTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php b/core/modules/views/src/Tests/ViewElementTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php rename to core/modules/views/src/Tests/ViewElementTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php rename to core/modules/views/src/Tests/ViewExecutableTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php b/core/modules/views/src/Tests/ViewPageControllerTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php rename to core/modules/views/src/Tests/ViewPageControllerTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php b/core/modules/views/src/Tests/ViewRenderTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php rename to core/modules/views/src/Tests/ViewRenderTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php rename to core/modules/views/src/Tests/ViewStorageTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php rename to core/modules/views/src/Tests/ViewTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestConfigInstaller.php b/core/modules/views/src/Tests/ViewTestConfigInstaller.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewTestConfigInstaller.php rename to core/modules/views/src/Tests/ViewTestConfigInstaller.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php b/core/modules/views/src/Tests/ViewTestData.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewTestData.php rename to core/modules/views/src/Tests/ViewTestData.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php b/core/modules/views/src/Tests/ViewUnitTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php rename to core/modules/views/src/Tests/ViewUnitTestBase.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php b/core/modules/views/src/Tests/ViewsDataTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php rename to core/modules/views/src/Tests/ViewsDataTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php b/core/modules/views/src/Tests/ViewsHooksTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php rename to core/modules/views/src/Tests/ViewsHooksTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php b/core/modules/views/src/Tests/ViewsTaxonomyAutocompleteTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php rename to core/modules/views/src/Tests/ViewsTaxonomyAutocompleteTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsTemplateTest.php b/core/modules/views/src/Tests/ViewsTemplateTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/ViewsTemplateTest.php rename to core/modules/views/src/Tests/ViewsTemplateTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php rename to core/modules/views/src/Tests/Wizard/BasicTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php rename to core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php b/core/modules/views/src/Tests/Wizard/MenuTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php rename to core/modules/views/src/Tests/Wizard/MenuTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php b/core/modules/views/src/Tests/Wizard/SortingTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php rename to core/modules/views/src/Tests/Wizard/SortingTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php rename to core/modules/views/src/Tests/Wizard/TaggedWithTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php rename to core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Tests/Wizard/WizardTestBase.php rename to core/modules/views/src/Tests/Wizard/WizardTestBase.php diff --git a/core/modules/views/lib/Drupal/views/ViewAccessController.php b/core/modules/views/src/ViewAccessController.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewAccessController.php rename to core/modules/views/src/ViewAccessController.php diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewExecutable.php rename to core/modules/views/src/ViewExecutable.php diff --git a/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php b/core/modules/views/src/ViewExecutableFactory.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewExecutableFactory.php rename to core/modules/views/src/ViewExecutableFactory.php diff --git a/core/modules/views/lib/Drupal/views/ViewStorageController.php b/core/modules/views/src/ViewStorageController.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewStorageController.php rename to core/modules/views/src/ViewStorageController.php diff --git a/core/modules/views/lib/Drupal/views/ViewStorageInterface.php b/core/modules/views/src/ViewStorageInterface.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewStorageInterface.php rename to core/modules/views/src/ViewStorageInterface.php diff --git a/core/modules/views/lib/Drupal/views/Views.php b/core/modules/views/src/Views.php similarity index 100% rename from core/modules/views/lib/Drupal/views/Views.php rename to core/modules/views/src/Views.php diff --git a/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php b/core/modules/views/src/ViewsAccessCheck.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewsAccessCheck.php rename to core/modules/views/src/ViewsAccessCheck.php diff --git a/core/modules/views/lib/Drupal/views/ViewsData.php b/core/modules/views/src/ViewsData.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewsData.php rename to core/modules/views/src/ViewsData.php diff --git a/core/modules/views/lib/Drupal/views/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php similarity index 100% rename from core/modules/views/lib/Drupal/views/ViewsDataHelper.php rename to core/modules/views/src/ViewsDataHelper.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php b/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php rename to core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php similarity index 100% rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php rename to core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php rename to core/modules/views/tests/src/Plugin/Block/ViewsBlockTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/argument_default/RawTest.php b/core/modules/views/tests/src/Plugin/argument_default/RawTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/Plugin/argument_default/RawTest.php rename to core/modules/views/tests/src/Plugin/argument_default/RawTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Plugin/field/CounterTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php rename to core/modules/views/tests/src/Plugin/field/CounterTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/PluginBaseTest.php b/core/modules/views/tests/src/PluginBaseTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/PluginBaseTest.php rename to core/modules/views/tests/src/PluginBaseTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/PluginTypeListTest.php b/core/modules/views/tests/src/PluginTypeListTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/PluginTypeListTest.php rename to core/modules/views/tests/src/PluginTypeListTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php b/core/modules/views/tests/src/ViewExecutableUnitTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php rename to core/modules/views/tests/src/ViewExecutableUnitTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsDataHelperTest.php b/core/modules/views/tests/src/ViewsDataHelperTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/ViewsDataHelperTest.php rename to core/modules/views/tests/src/ViewsDataHelperTest.php diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php b/core/modules/views/tests/src/ViewsTest.php similarity index 100% rename from core/modules/views/tests/Drupal/views/Tests/ViewsTest.php rename to core/modules/views/tests/src/ViewsTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php rename to core/modules/views_ui/src/Controller/ViewsUIController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php b/core/modules/views_ui/src/Form/AdvancedSettingsForm.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php rename to core/modules/views_ui/src/Form/AdvancedSettingsForm.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views_ui/src/Form/Ajax/AddItem.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php rename to core/modules/views_ui/src/Form/Ajax/AddItem.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php b/core/modules/views_ui/src/Form/Ajax/Analyze.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php rename to core/modules/views_ui/src/Form/Ajax/Analyze.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views_ui/src/Form/Ajax/ConfigItem.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php rename to core/modules/views_ui/src/Form/Ajax/ConfigItem.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php b/core/modules/views_ui/src/Form/Ajax/ConfigItemExtra.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php rename to core/modules/views_ui/src/Form/Ajax/ConfigItemExtra.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php b/core/modules/views_ui/src/Form/Ajax/ConfigItemGroup.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php rename to core/modules/views_ui/src/Form/Ajax/ConfigItemGroup.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php b/core/modules/views_ui/src/Form/Ajax/Display.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php rename to core/modules/views_ui/src/Form/Ajax/Display.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php b/core/modules/views_ui/src/Form/Ajax/EditDetails.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php rename to core/modules/views_ui/src/Form/Ajax/EditDetails.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php rename to core/modules/views_ui/src/Form/Ajax/Rearrange.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php rename to core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php b/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php rename to core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php rename to core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php rename to core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/src/Form/BasicSettingsForm.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php rename to core/modules/views_ui/src/Form/BasicSettingsForm.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php b/core/modules/views_ui/src/Form/BreakLockForm.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php rename to core/modules/views_ui/src/Form/BreakLockForm.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php b/core/modules/views_ui/src/ParamConverter/ViewUIConverter.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php rename to core/modules/views_ui/src/ParamConverter/ViewUIConverter.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsListTask.php b/core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsListTask.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsListTask.php rename to core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsListTask.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsAdvancedTask.php b/core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsAdvancedTask.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsAdvancedTask.php rename to core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsAdvancedTask.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsBasicTask.php b/core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsBasicTask.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsBasicTask.php rename to core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsBasicTask.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsTask.php b/core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsTask.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Plugin/Menu/LocalTask/ViewsSettingsTask.php rename to core/modules/views_ui/src/Plugin/Menu/LocalTask/ViewsSettingsTask.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php b/core/modules/views_ui/src/Tests/AnalyzeTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php rename to core/modules/views_ui/src/Tests/AnalyzeTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php b/core/modules/views_ui/src/Tests/CachedDataUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php rename to core/modules/views_ui/src/Tests/CachedDataUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php b/core/modules/views_ui/src/Tests/CustomBooleanTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php rename to core/modules/views_ui/src/Tests/CustomBooleanTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php b/core/modules/views_ui/src/Tests/DefaultViewsTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php rename to core/modules/views_ui/src/Tests/DefaultViewsTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php rename to core/modules/views_ui/src/Tests/DisplayAttachmentTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php b/core/modules/views_ui/src/Tests/DisplayExtenderUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php rename to core/modules/views_ui/src/Tests/DisplayExtenderUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php b/core/modules/views_ui/src/Tests/DisplayPath.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php rename to core/modules/views_ui/src/Tests/DisplayPath.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/src/Tests/DisplayTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php rename to core/modules/views_ui/src/Tests/DisplayTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php b/core/modules/views_ui/src/Tests/ExposedFormUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php rename to core/modules/views_ui/src/Tests/ExposedFormUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php b/core/modules/views_ui/src/Tests/FieldUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php rename to core/modules/views_ui/src/Tests/FieldUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php b/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php rename to core/modules/views_ui/src/Tests/FilterBooleanWebTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php b/core/modules/views_ui/src/Tests/GroupByTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php rename to core/modules/views_ui/src/Tests/GroupByTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php b/core/modules/views_ui/src/Tests/HandlerTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php rename to core/modules/views_ui/src/Tests/HandlerTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php b/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php rename to core/modules/views_ui/src/Tests/OverrideDisplaysTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php rename to core/modules/views_ui/src/Tests/PreviewTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php b/core/modules/views_ui/src/Tests/QueryTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php rename to core/modules/views_ui/src/Tests/QueryTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php b/core/modules/views_ui/src/Tests/RearrangeFieldsTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php rename to core/modules/views_ui/src/Tests/RearrangeFieldsTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php b/core/modules/views_ui/src/Tests/RedirectTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php rename to core/modules/views_ui/src/Tests/RedirectTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php b/core/modules/views_ui/src/Tests/RowUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php rename to core/modules/views_ui/src/Tests/RowUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php b/core/modules/views_ui/src/Tests/SettingsTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php rename to core/modules/views_ui/src/Tests/SettingsTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php b/core/modules/views_ui/src/Tests/StorageTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php rename to core/modules/views_ui/src/Tests/StorageTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php b/core/modules/views_ui/src/Tests/StyleUITest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php rename to core/modules/views_ui/src/Tests/StyleUITest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php b/core/modules/views_ui/src/Tests/TagTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php rename to core/modules/views_ui/src/Tests/TagTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php rename to core/modules/views_ui/src/Tests/UITestBase.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewsUITourTest.php b/core/modules/views_ui/src/Tests/ViewsUITourTest.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewsUITourTest.php rename to core/modules/views_ui/src/Tests/ViewsUITourTest.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/src/ViewAddFormController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php rename to core/modules/views_ui/src/ViewAddFormController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views_ui/src/ViewCloneFormController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php rename to core/modules/views_ui/src/ViewCloneFormController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteFormController.php b/core/modules/views_ui/src/ViewDeleteFormController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteFormController.php rename to core/modules/views_ui/src/ViewDeleteFormController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/src/ViewEditFormController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php rename to core/modules/views_ui/src/ViewEditFormController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views_ui/src/ViewFormControllerBase.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php rename to core/modules/views_ui/src/ViewFormControllerBase.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php b/core/modules/views_ui/src/ViewListController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php rename to core/modules/views_ui/src/ViewListController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/src/ViewPreviewFormController.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php rename to core/modules/views_ui/src/ViewPreviewFormController.php diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/src/ViewUI.php similarity index 100% rename from core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php rename to core/modules/views_ui/src/ViewUI.php diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/Form/Ajax/RearrangeFilterTest.php b/core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php similarity index 100% rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/Form/Ajax/RearrangeFilterTest.php rename to core/modules/views_ui/tests/src/Form/Ajax/RearrangeFilterTest.php diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php b/core/modules/views_ui/tests/src/ViewListControllerTest.php similarity index 100% rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php rename to core/modules/views_ui/tests/src/ViewListControllerTest.php diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php b/core/modules/views_ui/tests/src/ViewUIObjectTest.php similarity index 100% rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php rename to core/modules/views_ui/tests/src/ViewUIObjectTest.php diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php b/core/modules/xmlrpc/src/Tests/XmlRpcBasicTest.php similarity index 100% rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php rename to core/modules/xmlrpc/src/Tests/XmlRpcBasicTest.php diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php b/core/modules/xmlrpc/src/Tests/XmlRpcMessagesTest.php similarity index 100% rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php rename to core/modules/xmlrpc/src/Tests/XmlRpcMessagesTest.php diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php b/core/modules/xmlrpc/src/Tests/XmlRpcValidatorTest.php similarity index 100% rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php rename to core/modules/xmlrpc/src/Tests/XmlRpcValidatorTest.php diff --git a/core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php b/core/profiles/minimal/src/Tests/MinimalTest.php similarity index 100% rename from core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php rename to core/profiles/minimal/src/Tests/MinimalTest.php diff --git a/core/profiles/standard/lib/Drupal/standard/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php similarity index 100% rename from core/profiles/standard/lib/Drupal/standard/Tests/StandardTest.php rename to core/profiles/standard/src/Tests/StandardTest.php diff --git a/core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php b/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php similarity index 100% rename from core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php rename to core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 31ea371..d274252 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -4,7 +4,7 @@ * This script runs Drupal tests from command line. */ -require_once __DIR__ . '/../vendor/autoload.php'; +require_once __DIR__ . '/../autoload.php'; use Drupal\Core\StreamWrapper\PublicStream; diff --git a/core/scripts/switch-psr4.sh b/core/scripts/switch-psr4.sh new file mode 100644 index 0000000..3cec824 --- /dev/null +++ b/core/scripts/switch-psr4.sh @@ -0,0 +1,108 @@ +#!/bin/php +isDot()) { + // do nothing + } + elseif ($fileinfo->isDir()) { + process_candidate_dir($fileinfo->getPathname()); + } + } +} + +function process_candidate_dir($dir) { + foreach (new \DirectoryIterator($dir) as $fileinfo) { + if ($fileinfo->isDot()) { + // Ignore "." and "..". + } + elseif ($fileinfo->isDir()) { + // It's a directory. + switch ($fileinfo->getFilename()) { + case 'lib': + case 'src': + case 'module_autoload_test': + // Ignore these directory names. + continue; + default: + // Look for more extensions in subdirectories. + process_candidate_dir($fileinfo->getPathname()); + } + } + else { + // It's a file. + if (preg_match('/^(.+).info.yml$/', $fileinfo->getFilename(), $m)) { + // It's a *.info.yml file, so we found an extension directory. + $extension_name = $m[1]; + } + } + } + if (isset($extension_name)) { + process_extension($extension_name, $dir); + } +} + +function process_extension($name, $dir) { + + // Move main module class files. + if (is_dir("$dir/lib/Drupal/$name")) { + // This is a module directory with a PSR-0 /lib/ folder. + if (!is_dir($dir . '/src')) { + mkdir($dir . '/src'); + } + rename("$dir/lib/Drupal/$name", "$dir/src"); + } + + // Move class files in tests directory. + if (is_dir("$dir/tests/Drupal/$name/Tests")) { + rename("$dir/tests/Drupal/$name/Tests", "$dir/tests/src"); + } + + // Clean up empty directories. + foreach (array( + "lib/Drupal/$name", + 'lib/Drupal', + 'lib', + "tests/Drupal/$name/Tests", + "tests/Drupal/$name", + "tests/Drupal", + ) as $subdir) { + if (is_dir_empty("$dir/$subdir")) { + rmdir("$dir/$subdir"); + } + } +} + +function is_dir_empty($dir) { + if (!is_readable($dir)) { + return NULL; + } + $handle = opendir($dir); + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + return FALSE; + } + } + return TRUE; +} diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php index 66c4be4..e0be3f8 100644 --- a/core/tests/bootstrap.php +++ b/core/tests/bootstrap.php @@ -1,7 +1,7 @@ add('Drupal\\Tests', __DIR__); foreach (scandir(__DIR__ . "/../modules") as $module) { diff --git a/core/update.php b/core/update.php index ac36b2a..0238871 100644 --- a/core/update.php +++ b/core/update.php @@ -22,7 +22,7 @@ // Change the directory to the Drupal root. chdir('..'); -require_once __DIR__ . '/vendor/autoload.php'; +require_once __DIR__ . '/autoload.php'; // Exit early if an incompatible PHP version would cause fatal errors. // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not diff --git a/index.php b/index.php index 426aa22..5f5ada6 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * See COPYRIGHT.txt and LICENSE.txt files in the "core" directory. */ -require_once __DIR__ . '/core/vendor/autoload.php'; +require_once __DIR__ . '/core/autoload.php'; require_once __DIR__ . '/core/includes/bootstrap.inc'; try {