diff --git a/core/composer.json b/core/composer.json index 770631ddfd..5cc3031f46 100644 --- a/core/composer.json +++ b/core/composer.json @@ -171,37 +171,6 @@ "drupal/workflows": "self.version", "drupal/workspace": "self.version" }, - "extra": { - "merge-plugin": { - "require": [ - "core/lib/Drupal/Component/Annotation/composer.json", - "core/lib/Drupal/Component/Assertion/composer.json", - "core/lib/Drupal/Component/Bridge/composer.json", - "core/lib/Drupal/Component/ClassFinder/composer.json", - "core/lib/Drupal/Component/Datetime/composer.json", - "core/lib/Drupal/Component/DependencyInjection/composer.json", - "core/lib/Drupal/Component/Diff/composer.json", - "core/lib/Drupal/Component/Discovery/composer.json", - "core/lib/Drupal/Component/EventDispatcher/composer.json", - "core/lib/Drupal/Component/FileCache/composer.json", - "core/lib/Drupal/Component/FileSystem/composer.json", - "core/lib/Drupal/Component/Gettext/composer.json", - "core/lib/Drupal/Component/Graph/composer.json", - "core/lib/Drupal/Component/HttpFoundation/composer.json", - "core/lib/Drupal/Component/PhpStorage/composer.json", - "core/lib/Drupal/Component/Plugin/composer.json", - "core/lib/Drupal/Component/ProxyBuilder/composer.json", - "core/lib/Drupal/Component/Render/composer.json", - "core/lib/Drupal/Component/Serialization/composer.json", - "core/lib/Drupal/Component/Transliteration/composer.json", - "core/lib/Drupal/Component/Utility/composer.json", - "core/lib/Drupal/Component/Uuid/composer.json" - ], - "recurse": false, - "replace": false, - "merge-extra": false - } - }, "minimum-stability": "dev", "prefer-stable": true, "autoload": { @@ -218,6 +187,9 @@ "lib/Drupal/Core/DrupalKernel.php", "lib/Drupal/Core/DrupalKernelInterface.php", "lib/Drupal/Core/Site/Settings.php" + ], + "exclude-from-classmap": [ + "lib/Drupal/Component/*/Tests/" ] }, "config": { @@ -227,7 +199,7 @@ "scripts": { "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump", "post-autoload-dump": [ - "Drupal\\Core\\Composer\\Composer::ensureHtaccess" + "Drupal\\Core\\Composer\\Composer::ensureHtaccess" ] } } diff --git a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php b/core/lib/Drupal/Component/Annotation/Tests/AnnotatedClassDiscoveryCachedTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php rename to core/lib/Drupal/Component/Annotation/Tests/AnnotatedClassDiscoveryCachedTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php b/core/lib/Drupal/Component/Annotation/Tests/AnnotatedClassDiscoveryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php rename to core/lib/Drupal/Component/Annotation/Tests/AnnotatedClassDiscoveryTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/AnnotationBaseTest.php b/core/lib/Drupal/Component/Annotation/Tests/AnnotationBaseTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/AnnotationBaseTest.php rename to core/lib/Drupal/Component/Annotation/Tests/AnnotationBaseTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/Fixtures/PluginNamespace/DiscoveryTest1.php b/core/lib/Drupal/Component/Annotation/Tests/Fixtures/PluginNamespace/DiscoveryTest1.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/Fixtures/PluginNamespace/DiscoveryTest1.php rename to core/lib/Drupal/Component/Annotation/Tests/Fixtures/PluginNamespace/DiscoveryTest1.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/Fixtures/PluginNamespace/discoverytest2.yml b/core/lib/Drupal/Component/Annotation/Tests/Fixtures/PluginNamespace/discoverytest2.yml similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/Fixtures/PluginNamespace/discoverytest2.yml rename to core/lib/Drupal/Component/Annotation/Tests/Fixtures/PluginNamespace/discoverytest2.yml diff --git a/core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php b/core/lib/Drupal/Component/Annotation/Tests/MockFileFinderTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/MockFileFinderTest.php rename to core/lib/Drupal/Component/Annotation/Tests/MockFileFinderTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecoratorTest.php b/core/lib/Drupal/Component/Annotation/Tests/Plugin/Discovery/AnnotationBridgeDecoratorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecoratorTest.php rename to core/lib/Drupal/Component/Annotation/Tests/Plugin/Discovery/AnnotationBridgeDecoratorTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/PluginIdTest.php b/core/lib/Drupal/Component/Annotation/Tests/PluginIdTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/PluginIdTest.php rename to core/lib/Drupal/Component/Annotation/Tests/PluginIdTest.php diff --git a/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php b/core/lib/Drupal/Component/Annotation/Tests/PluginTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Annotation/PluginTest.php rename to core/lib/Drupal/Component/Annotation/Tests/PluginTest.php diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json index 51e7d25b00..a3098faba9 100644 --- a/core/lib/Drupal/Component/Annotation/composer.json +++ b/core/lib/Drupal/Component/Annotation/composer.json @@ -1,20 +1,25 @@ { - "name": "drupal/core-annotation", - "description": "Annotation discovery and implementation of plugins.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "doctrine/common": "^2.5", - "doctrine/annotations": "1.2.*", - "drupal/core-file-cache": "^8.2", - "drupal/core-plugin": "^8.2", - "drupal/core-utility": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Annotation\\": "" + "name": "drupal/core-annotation", + "description": "Annotation discovery and implementation of plugins.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "doctrine/common": "^2.5", + "doctrine/annotations": "1.2.*", + "drupal/core-file-cache": "^8.2", + "drupal/core-plugin": "^8.2", + "drupal/core-utility": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Annotation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php b/core/lib/Drupal/Component/Assertion/Tests/InspectorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php rename to core/lib/Drupal/Component/Assertion/Tests/InspectorTest.php diff --git a/core/lib/Drupal/Component/Assertion/composer.json b/core/lib/Drupal/Component/Assertion/composer.json index cdc8c928fb..4015d1a1e8 100644 --- a/core/lib/Drupal/Component/Assertion/composer.json +++ b/core/lib/Drupal/Component/Assertion/composer.json @@ -1,15 +1,20 @@ { - "name": "drupal/core-assertion", - "description": "Provides runtime assertions similar to those in PHP 7, under PHP 5.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Assertion\\": "" + "name": "drupal/core-assertion", + "description": "Provides runtime assertions similar to those in PHP 7, under PHP 5.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Assertion\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php b/core/lib/Drupal/Component/Bridge/Tests/ZfExtensionManagerSfContainerTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php rename to core/lib/Drupal/Component/Bridge/Tests/ZfExtensionManagerSfContainerTest.php diff --git a/core/lib/Drupal/Component/Bridge/composer.json b/core/lib/Drupal/Component/Bridge/composer.json index 19c8a3b1d3..dd3ca5f656 100644 --- a/core/lib/Drupal/Component/Bridge/composer.json +++ b/core/lib/Drupal/Component/Bridge/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-bridge", - "description": "Bridge.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "zendframework/zend-feed": "^2.4" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Bridge\\": "" + "name": "drupal/core-bridge", + "description": "Bridge.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "zendframework/zend-feed": "^2.4" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Bridge\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php b/core/lib/Drupal/Component/ClassFinder/Tests/ClassFinderTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php rename to core/lib/Drupal/Component/ClassFinder/Tests/ClassFinderTest.php diff --git a/core/lib/Drupal/Component/ClassFinder/composer.json b/core/lib/Drupal/Component/ClassFinder/composer.json index c5a97b09f1..de1d8e284b 100644 --- a/core/lib/Drupal/Component/ClassFinder/composer.json +++ b/core/lib/Drupal/Component/ClassFinder/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-class-finder", - "description": "This class provides a class finding utility.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "doctrine/common": "^2.5" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\ClassFinder\\": "" + "name": "drupal/core-class-finder", + "description": "This class provides a class finding utility.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "doctrine/common": "^2.5" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\ClassFinder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/core/lib/Drupal/Component/Datetime/Tests/DateTimePlusTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php rename to core/lib/Drupal/Component/Datetime/Tests/DateTimePlusTest.php diff --git a/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php b/core/lib/Drupal/Component/Datetime/Tests/TimeTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Datetime/TimeTest.php rename to core/lib/Drupal/Component/Datetime/Tests/TimeTest.php diff --git a/core/lib/Drupal/Component/Datetime/composer.json b/core/lib/Drupal/Component/Datetime/composer.json index 6b7f89f00b..35b1a03901 100644 --- a/core/lib/Drupal/Component/Datetime/composer.json +++ b/core/lib/Drupal/Component/Datetime/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-datetime", - "description": "This class wraps the PHP DateTime class with more flexible initialization parameters, allowing a date to be created from an existing date object, a timestamp, a string with an unknown format, a string with a known format, or an array of date parts. It also adds an errors array and a __toString() method to the date object.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "drupal/core-utility": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Datetime\\": "" + "name": "drupal/core-datetime", + "description": "This class wraps the PHP DateTime class with more flexible initialization parameters, allowing a date to be created from an existing date object, a timestamp, a string with an unknown format, a string with a known format, or an array of date parts. It also adds an errors array and a __toString() method to the date object.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "drupal/core-utility": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Datetime\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/lib/Drupal/Component/DependencyInjection/Tests/ContainerTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php rename to core/lib/Drupal/Component/DependencyInjection/Tests/ContainerTest.php diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/lib/Drupal/Component/DependencyInjection/Tests/Dumper/OptimizedPhpArrayDumperTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php rename to core/lib/Drupal/Component/DependencyInjection/Tests/Dumper/OptimizedPhpArrayDumperTest.php diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php b/core/lib/Drupal/Component/DependencyInjection/Tests/Dumper/PhpArrayDumperTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php rename to core/lib/Drupal/Component/DependencyInjection/Tests/Dumper/PhpArrayDumperTest.php diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Fixture/container_test_file_service_test_service_function.data b/core/lib/Drupal/Component/DependencyInjection/Tests/Fixture/container_test_file_service_test_service_function.data similarity index 100% rename from core/tests/Drupal/Tests/Component/DependencyInjection/Fixture/container_test_file_service_test_service_function.data rename to core/lib/Drupal/Component/DependencyInjection/Tests/Fixture/container_test_file_service_test_service_function.data diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php b/core/lib/Drupal/Component/DependencyInjection/Tests/PhpArrayContainerTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php rename to core/lib/Drupal/Component/DependencyInjection/Tests/PhpArrayContainerTest.php diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index 846034affa..743e3e5b4b 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -1,25 +1,31 @@ { - "name": "drupal/core-dependency-injection", - "description": "Dependency Injection container optimized for Drupal's needs.", - "keywords": ["drupal", "dependency injection"], - "type": "library", - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "require": { - "php": ">=5.5.9", - "symfony/dependency-injection": ">=2.8 <4.0.0" - }, - "suggest": { - "symfony/expression-language": "For using expressions in service container configuration" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\DependencyInjection\\": "" + "name": "drupal/core-dependency-injection", + "description": "Dependency Injection container optimized for Drupal's needs.", + "keywords": [ + "drupal", + "dependency injection" + ], + "type": "library", + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "require": { + "php": ">=5.5.9", + "symfony/dependency-injection": ">=2.8 <4.0.0" + }, + "suggest": { + "symfony/expression-language": "For using expressions in service container configuration" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Diff/DiffFormatterTest.php b/core/lib/Drupal/Component/Diff/Tests/DiffFormatterTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/DiffFormatterTest.php rename to core/lib/Drupal/Component/Diff/Tests/DiffFormatterTest.php diff --git a/core/tests/Drupal/Tests/Component/Diff/Engine/DiffEngineTest.php b/core/lib/Drupal/Component/Diff/Tests/Engine/DiffEngineTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/Engine/DiffEngineTest.php rename to core/lib/Drupal/Component/Diff/Tests/Engine/DiffEngineTest.php diff --git a/core/tests/Drupal/Tests/Component/Diff/Engine/DiffOpTest.php b/core/lib/Drupal/Component/Diff/Tests/Engine/DiffOpTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/Engine/DiffOpTest.php rename to core/lib/Drupal/Component/Diff/Tests/Engine/DiffOpTest.php diff --git a/core/tests/Drupal/Tests/Component/Diff/Engine/HWLDFWordAccumulatorTest.php b/core/lib/Drupal/Component/Diff/Tests/Engine/HWLDFWordAccumulatorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/Engine/HWLDFWordAccumulatorTest.php rename to core/lib/Drupal/Component/Diff/Tests/Engine/HWLDFWordAccumulatorTest.php diff --git a/core/tests/Drupal/Tests/Component/Diff/Engine/fixtures/file1.txt b/core/lib/Drupal/Component/Diff/Tests/Engine/fixtures/file1.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/Engine/fixtures/file1.txt rename to core/lib/Drupal/Component/Diff/Tests/Engine/fixtures/file1.txt diff --git a/core/tests/Drupal/Tests/Component/Diff/Engine/fixtures/file2.txt b/core/lib/Drupal/Component/Diff/Tests/Engine/fixtures/file2.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Diff/Engine/fixtures/file2.txt rename to core/lib/Drupal/Component/Diff/Tests/Engine/fixtures/file2.txt diff --git a/core/lib/Drupal/Component/Diff/composer.json b/core/lib/Drupal/Component/Diff/composer.json index b3016084a2..c46acd1633 100644 --- a/core/lib/Drupal/Component/Diff/composer.json +++ b/core/lib/Drupal/Component/Diff/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-diff", - "description": "Diff.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Diff\\": "" + "name": "drupal/core-diff", + "description": "Diff.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Diff\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php b/core/lib/Drupal/Component/Discovery/Tests/YamlDirectoryDiscoveryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php rename to core/lib/Drupal/Component/Discovery/Tests/YamlDirectoryDiscoveryTest.php diff --git a/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php b/core/lib/Drupal/Component/Discovery/Tests/YamlDiscoveryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php rename to core/lib/Drupal/Component/Discovery/Tests/YamlDiscoveryTest.php diff --git a/core/lib/Drupal/Component/Discovery/composer.json b/core/lib/Drupal/Component/Discovery/composer.json index 4de189402a..f6e49cb0c2 100644 --- a/core/lib/Drupal/Component/Discovery/composer.json +++ b/core/lib/Drupal/Component/Discovery/composer.json @@ -1,17 +1,22 @@ { - "name": "drupal/core-discovery", - "description": "Discovery.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "drupal/core-file-cache": "^8.2", - "drupal/core-serialization": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Discovery\\": "" + "name": "drupal/core-discovery", + "description": "Discovery.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "drupal/core-file-cache": "^8.2", + "drupal/core-serialization": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Discovery\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/lib/Drupal/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php rename to core/lib/Drupal/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json index cfbcc72e3f..10e2739bbf 100644 --- a/core/lib/Drupal/Component/EventDispatcher/composer.json +++ b/core/lib/Drupal/Component/EventDispatcher/composer.json @@ -1,17 +1,22 @@ { - "name": "drupal/core-event-dispatcher", - "description": "EventDispatcher.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "symfony/dependency-injection": ">=2.8 <4.0.0", - "symfony/event-dispatcher": ">=2.7 <4.0.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\EventDispatcher\\": "" + "name": "drupal/core-event-dispatcher", + "description": "EventDispatcher.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "symfony/dependency-injection": ">=2.8 <4.0.0", + "symfony/event-dispatcher": ">=2.7 <4.0.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/lib/Drupal/Component/FileCache/Tests/FileCacheFactoryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php rename to core/lib/Drupal/Component/FileCache/Tests/FileCacheFactoryTest.php diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php b/core/lib/Drupal/Component/FileCache/Tests/FileCacheTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php rename to core/lib/Drupal/Component/FileCache/Tests/FileCacheTest.php diff --git a/core/tests/Drupal/Tests/Component/FileCache/Fixtures/llama-23.txt b/core/lib/Drupal/Component/FileCache/Tests/Fixtures/llama-23.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/FileCache/Fixtures/llama-23.txt rename to core/lib/Drupal/Component/FileCache/Tests/Fixtures/llama-23.txt diff --git a/core/tests/Drupal/Tests/Component/FileCache/Fixtures/llama-42.txt b/core/lib/Drupal/Component/FileCache/Tests/Fixtures/llama-42.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/FileCache/Fixtures/llama-42.txt rename to core/lib/Drupal/Component/FileCache/Tests/Fixtures/llama-42.txt diff --git a/core/tests/Drupal/Tests/Component/FileCache/StaticFileCacheBackend.php b/core/lib/Drupal/Component/FileCache/Tests/StaticFileCacheBackend.php similarity index 100% rename from core/tests/Drupal/Tests/Component/FileCache/StaticFileCacheBackend.php rename to core/lib/Drupal/Component/FileCache/Tests/StaticFileCacheBackend.php diff --git a/core/lib/Drupal/Component/FileCache/composer.json b/core/lib/Drupal/Component/FileCache/composer.json index 86e33a5f91..51600b1835 100644 --- a/core/lib/Drupal/Component/FileCache/composer.json +++ b/core/lib/Drupal/Component/FileCache/composer.json @@ -1,15 +1,20 @@ { - "name": "drupal/core-file-cache", - "description": "FileCache.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\FileCache\\": "" + "name": "drupal/core-file-cache", + "description": "FileCache.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\FileCache\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/FileSystem/RegexDirectoryIteratorTest.php b/core/lib/Drupal/Component/FileSystem/Tests/RegexDirectoryIteratorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/FileSystem/RegexDirectoryIteratorTest.php rename to core/lib/Drupal/Component/FileSystem/Tests/RegexDirectoryIteratorTest.php diff --git a/core/lib/Drupal/Component/FileSystem/composer.json b/core/lib/Drupal/Component/FileSystem/composer.json index 528bb0744a..999e4191f9 100644 --- a/core/lib/Drupal/Component/FileSystem/composer.json +++ b/core/lib/Drupal/Component/FileSystem/composer.json @@ -1,15 +1,20 @@ { - "name": "drupal/core-filesystem", - "description": "FileSystem.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\FileSystem\\": "" + "name": "drupal/core-filesystem", + "description": "FileSystem.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\FileSystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php b/core/lib/Drupal/Component/Gettext/Tests/PoHeaderTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php rename to core/lib/Drupal/Component/Gettext/Tests/PoHeaderTest.php diff --git a/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php b/core/lib/Drupal/Component/Gettext/Tests/PoStreamWriterTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php rename to core/lib/Drupal/Component/Gettext/Tests/PoStreamWriterTest.php diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json index 87f500a108..440060dd42 100644 --- a/core/lib/Drupal/Component/Gettext/composer.json +++ b/core/lib/Drupal/Component/Gettext/composer.json @@ -1,20 +1,23 @@ { - "name": "drupal/core-gettext", - "description": "PHP library for reading PO files.", - "type": "library", - "license": "GPL-2.0-or-later", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "require": { - "php": ">=5.5.9", - "drupal/core-utility": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Gettext\\": "" + "name": "drupal/core-gettext", + "description": "PHP library for reading PO files.", + "type": "library", + "license": "GPL-2.0-or-later", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "require": { + "php": ">=5.5.9", + "drupal/core-utility": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Gettext\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Graph/GraphTest.php b/core/lib/Drupal/Component/Graph/Tests/GraphTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Graph/GraphTest.php rename to core/lib/Drupal/Component/Graph/Tests/GraphTest.php diff --git a/core/lib/Drupal/Component/Graph/composer.json b/core/lib/Drupal/Component/Graph/composer.json index e8f645fd20..631b5a1778 100644 --- a/core/lib/Drupal/Component/Graph/composer.json +++ b/core/lib/Drupal/Component/Graph/composer.json @@ -1,15 +1,20 @@ { - "name": "drupal/core-graph", - "description": "Graph.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Graph\\": "" + "name": "drupal/core-graph", + "description": "Graph.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Graph\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/HttpFoundation/SecuredRedirectResponseTest.php b/core/lib/Drupal/Component/HttpFoundation/Tests/SecuredRedirectResponseTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/HttpFoundation/SecuredRedirectResponseTest.php rename to core/lib/Drupal/Component/HttpFoundation/Tests/SecuredRedirectResponseTest.php diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json index 910a648a21..b75228d6a5 100644 --- a/core/lib/Drupal/Component/HttpFoundation/composer.json +++ b/core/lib/Drupal/Component/HttpFoundation/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-http-foundation", - "description": "HttpFoundation.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "symfony/http-foundation": ">=2.7 <4.0.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\HttpFoundation\\": "" + "name": "drupal/core-http-foundation", + "description": "HttpFoundation.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "symfony/http-foundation": ">=2.7 <4.0.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/core/lib/Drupal/Component/PhpStorage/Tests/FileStorageReadOnlyTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php rename to core/lib/Drupal/Component/PhpStorage/Tests/FileStorageReadOnlyTest.php diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/core/lib/Drupal/Component/PhpStorage/Tests/FileStorageTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php rename to core/lib/Drupal/Component/PhpStorage/Tests/FileStorageTest.php diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php b/core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFastFileStorageTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php rename to core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFastFileStorageTest.php diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFileStorageBase.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php rename to core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFileStorageBase.php diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php b/core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFileStorageTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php rename to core/lib/Drupal/Component/PhpStorage/Tests/MTimeProtectedFileStorageTest.php diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php b/core/lib/Drupal/Component/PhpStorage/Tests/PhpStorageTestBase.php similarity index 100% rename from core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php rename to core/lib/Drupal/Component/PhpStorage/Tests/PhpStorageTestBase.php diff --git a/core/lib/Drupal/Component/PhpStorage/composer.json b/core/lib/Drupal/Component/PhpStorage/composer.json index 614652a95c..347142905b 100644 --- a/core/lib/Drupal/Component/PhpStorage/composer.json +++ b/core/lib/Drupal/Component/PhpStorage/composer.json @@ -1,15 +1,20 @@ { - "name": "drupal/core-php-storage", - "description": "PhpStorage.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\PhpStorage\\": "" + "name": "drupal/core-php-storage", + "description": "PhpStorage.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\PhpStorage\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php b/core/lib/Drupal/Component/Plugin/Tests/Context/ContextTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php rename to core/lib/Drupal/Component/Plugin/Tests/Context/ContextTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php b/core/lib/Drupal/Component/Plugin/Tests/DefaultFactoryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php rename to core/lib/Drupal/Component/Plugin/Tests/DefaultFactoryTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php b/core/lib/Drupal/Component/Plugin/Tests/Discovery/DiscoveryCachedTraitTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php rename to core/lib/Drupal/Component/Plugin/Tests/Discovery/DiscoveryCachedTraitTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php b/core/lib/Drupal/Component/Plugin/Tests/Discovery/DiscoveryTraitTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php rename to core/lib/Drupal/Component/Plugin/Tests/Discovery/DiscoveryTraitTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php b/core/lib/Drupal/Component/Plugin/Tests/Discovery/StaticDiscoveryDecoratorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php rename to core/lib/Drupal/Component/Plugin/Tests/Discovery/StaticDiscoveryDecoratorTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php b/core/lib/Drupal/Component/Plugin/Tests/Factory/ReflectionFactoryTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php rename to core/lib/Drupal/Component/Plugin/Tests/Factory/ReflectionFactoryTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/Broccoli.php b/core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/Broccoli.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/Broccoli.php rename to core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/Broccoli.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/Corn.php b/core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/Corn.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/Corn.php rename to core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/Corn.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/VegetableInterface.php b/core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/VegetableInterface.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/Fixtures/vegetable/VegetableInterface.php rename to core/lib/Drupal/Component/Plugin/Tests/Fixtures/vegetable/VegetableInterface.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php b/core/lib/Drupal/Component/Plugin/Tests/PluginBaseTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php rename to core/lib/Drupal/Component/Plugin/Tests/PluginBaseTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php b/core/lib/Drupal/Component/Plugin/Tests/PluginManagerBaseTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php rename to core/lib/Drupal/Component/Plugin/Tests/PluginManagerBaseTest.php diff --git a/core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php b/core/lib/Drupal/Component/Plugin/Tests/StubFallbackPluginManager.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php rename to core/lib/Drupal/Component/Plugin/Tests/StubFallbackPluginManager.php diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json index 77f02d6fb1..f70fc8e8b6 100644 --- a/core/lib/Drupal/Component/Plugin/composer.json +++ b/core/lib/Drupal/Component/Plugin/composer.json @@ -1,19 +1,26 @@ { - "name": "drupal/core-plugin", - "description": "Base building block for a scalable and extensible plug-in system for PHP components and application framework extensions.", - "keywords": ["drupal", "plugin", "plugins"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "symfony/validator": ">=2.7 <4.0.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Plugin\\": "" + "name": "drupal/core-plugin", + "description": "Base building block for a scalable and extensible plug-in system for PHP components and application framework extensions.", + "keywords": [ + "drupal", + "plugin", + "plugins" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "symfony/validator": ">=2.7 <4.0.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Plugin\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "suggest": { + "symfony/validator": "Leveraged in the use of context aware plugins." } - }, - "suggest": { - "symfony/validator": "Leveraged in the use of context aware plugins." - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php b/core/lib/Drupal/Component/ProxyBuilder/Tests/ProxyBuilderTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php rename to core/lib/Drupal/Component/ProxyBuilder/Tests/ProxyBuilderTest.php diff --git a/core/lib/Drupal/Component/ProxyBuilder/composer.json b/core/lib/Drupal/Component/ProxyBuilder/composer.json index 52fbdb8065..19c68dc251 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/composer.json +++ b/core/lib/Drupal/Component/ProxyBuilder/composer.json @@ -1,15 +1,21 @@ { - "name": "drupal/core-proxy-builder", - "description": "Provides a lightweight mechanism to provide lazy loaded proxies.", - "keywords": ["drupal", "proxy"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\ProxyBuilder\\": "" + "name": "drupal/core-proxy-builder", + "description": "Provides a lightweight mechanism to provide lazy loaded proxies.", + "keywords": [ + "drupal", + "proxy" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\ProxyBuilder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php b/core/lib/Drupal/Component/Render/Tests/FormattableMarkupTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php rename to core/lib/Drupal/Component/Render/Tests/FormattableMarkupTest.php diff --git a/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php b/core/lib/Drupal/Component/Render/Tests/HtmlEscapedTextTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php rename to core/lib/Drupal/Component/Render/Tests/HtmlEscapedTextTest.php diff --git a/core/tests/Drupal/Tests/Component/Render/PlainTextOutputTest.php b/core/lib/Drupal/Component/Render/Tests/PlainTextOutputTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Render/PlainTextOutputTest.php rename to core/lib/Drupal/Component/Render/Tests/PlainTextOutputTest.php diff --git a/core/lib/Drupal/Component/Render/composer.json b/core/lib/Drupal/Component/Render/composer.json index 9e44b2dd39..098726af2b 100644 --- a/core/lib/Drupal/Component/Render/composer.json +++ b/core/lib/Drupal/Component/Render/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-render", - "description": "Renders placeholder variables for HTML and plain-text display.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "drupal/core-utility": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Render\\": "" + "name": "drupal/core-render", + "description": "Renders placeholder variables for HTML and plain-text display.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "drupal/core-utility": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Render\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php b/core/lib/Drupal/Component/Serialization/Tests/JsonTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Serialization/JsonTest.php rename to core/lib/Drupal/Component/Serialization/Tests/JsonTest.php diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php b/core/lib/Drupal/Component/Serialization/Tests/YamlPeclTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php rename to core/lib/Drupal/Component/Serialization/Tests/YamlPeclTest.php diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php b/core/lib/Drupal/Component/Serialization/Tests/YamlSymfonyTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php rename to core/lib/Drupal/Component/Serialization/Tests/YamlSymfonyTest.php diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php b/core/lib/Drupal/Component/Serialization/Tests/YamlTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Serialization/YamlTest.php rename to core/lib/Drupal/Component/Serialization/Tests/YamlTest.php diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlTestBase.php b/core/lib/Drupal/Component/Serialization/Tests/YamlTestBase.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Serialization/YamlTestBase.php rename to core/lib/Drupal/Component/Serialization/Tests/YamlTestBase.php diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json index 3439f58639..a7e074d86d 100644 --- a/core/lib/Drupal/Component/Serialization/composer.json +++ b/core/lib/Drupal/Component/Serialization/composer.json @@ -1,16 +1,21 @@ { - "name": "drupal/core-serialization", - "description": "Serialization.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "symfony/yaml": ">=2.7 <4.0.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Serialization\\": "" + "name": "drupal/core-serialization", + "description": "Serialization.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "symfony/yaml": ">=2.7 <4.0.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Serialization\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php b/core/lib/Drupal/Component/Transliteration/Tests/PhpTransliterationTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php rename to core/lib/Drupal/Component/Transliteration/Tests/PhpTransliterationTest.php diff --git a/core/lib/Drupal/Component/Transliteration/composer.json b/core/lib/Drupal/Component/Transliteration/composer.json index abdce4fc81..970179f490 100644 --- a/core/lib/Drupal/Component/Transliteration/composer.json +++ b/core/lib/Drupal/Component/Transliteration/composer.json @@ -1,16 +1,19 @@ { - "name": "drupal/core-transliteration", - "description": "Transliteration.", - "type": "library", - "license": "GPL-2.0-or-later", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Transliteration\\": "" + "name": "drupal/core-transliteration", + "description": "Transliteration.", + "type": "library", + "license": "GPL-2.0-or-later", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Transliteration\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php b/core/lib/Drupal/Component/Utility/Tests/ArgumentsResolverTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php rename to core/lib/Drupal/Component/Utility/Tests/ArgumentsResolverTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/BytesTest.php b/core/lib/Drupal/Component/Utility/Tests/BytesTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/BytesTest.php rename to core/lib/Drupal/Component/Utility/Tests/BytesTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/ColorTest.php b/core/lib/Drupal/Component/Utility/Tests/ColorTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/ColorTest.php rename to core/lib/Drupal/Component/Utility/Tests/ColorTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php b/core/lib/Drupal/Component/Utility/Tests/CryptRandomFallbackTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php rename to core/lib/Drupal/Component/Utility/Tests/CryptRandomFallbackTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/CryptTest.php b/core/lib/Drupal/Component/Utility/Tests/CryptTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/CryptTest.php rename to core/lib/Drupal/Component/Utility/Tests/CryptTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php b/core/lib/Drupal/Component/Utility/Tests/EnvironmentTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php rename to core/lib/Drupal/Component/Utility/Tests/EnvironmentTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/lib/Drupal/Component/Utility/Tests/HtmlTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/HtmlTest.php rename to core/lib/Drupal/Component/Utility/Tests/HtmlTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/ImageTest.php b/core/lib/Drupal/Component/Utility/Tests/ImageTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/ImageTest.php rename to core/lib/Drupal/Component/Utility/Tests/ImageTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/core/lib/Drupal/Component/Utility/Tests/NestedArrayTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php rename to core/lib/Drupal/Component/Utility/Tests/NestedArrayTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/core/lib/Drupal/Component/Utility/Tests/NumberTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/NumberTest.php rename to core/lib/Drupal/Component/Utility/Tests/NumberTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php b/core/lib/Drupal/Component/Utility/Tests/RandomTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/RandomTest.php rename to core/lib/Drupal/Component/Utility/Tests/RandomTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php b/core/lib/Drupal/Component/Utility/Tests/RectangleTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/RectangleTest.php rename to core/lib/Drupal/Component/Utility/Tests/RectangleTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/lib/Drupal/Component/Utility/Tests/SafeMarkupTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php rename to core/lib/Drupal/Component/Utility/Tests/SafeMarkupTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php b/core/lib/Drupal/Component/Utility/Tests/SortArrayTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php rename to core/lib/Drupal/Component/Utility/Tests/SortArrayTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/TextWrapper.php b/core/lib/Drupal/Component/Utility/Tests/TextWrapper.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/TextWrapper.php rename to core/lib/Drupal/Component/Utility/Tests/TextWrapper.php diff --git a/core/tests/Drupal/Tests/Component/Utility/TimerTest.php b/core/lib/Drupal/Component/Utility/Tests/TimerTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/TimerTest.php rename to core/lib/Drupal/Component/Utility/Tests/TimerTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/core/lib/Drupal/Component/Utility/Tests/UnicodeTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php rename to core/lib/Drupal/Component/Utility/Tests/UnicodeTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/lib/Drupal/Component/Utility/Tests/UrlHelperTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php rename to core/lib/Drupal/Component/Utility/Tests/UrlHelperTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php b/core/lib/Drupal/Component/Utility/Tests/UserAgentTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php rename to core/lib/Drupal/Component/Utility/Tests/UserAgentTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/VariableTest.php b/core/lib/Drupal/Component/Utility/Tests/VariableTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/VariableTest.php rename to core/lib/Drupal/Component/Utility/Tests/VariableTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/core/lib/Drupal/Component/Utility/Tests/XssTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/XssTest.php rename to core/lib/Drupal/Component/Utility/Tests/XssTest.php diff --git a/core/tests/Drupal/Tests/Component/Utility/fixtures/RectangleTest.json b/core/lib/Drupal/Component/Utility/Tests/fixtures/RectangleTest.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Utility/fixtures/RectangleTest.json rename to core/lib/Drupal/Component/Utility/Tests/fixtures/RectangleTest.json diff --git a/core/lib/Drupal/Component/Utility/composer.json b/core/lib/Drupal/Component/Utility/composer.json index b89e813903..f8838cb6e1 100644 --- a/core/lib/Drupal/Component/Utility/composer.json +++ b/core/lib/Drupal/Component/Utility/composer.json @@ -1,19 +1,24 @@ { - "name": "drupal/core-utility", - "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0-or-later", - "require": { - "php": ">=5.5.9", - "paragonie/random_compat": "^1.0|^2.0", - "drupal/core-render": "^8.2", - "symfony/polyfill-iconv": "~1.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Utility\\": "" + "name": "drupal/core-utility", + "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.", + "keywords": [ + "drupal" + ], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0-or-later", + "require": { + "php": ">=5.5.9", + "paragonie/random_compat": "^1.0|^2.0", + "drupal/core-render": "^8.2", + "symfony/polyfill-iconv": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Utility\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/core/lib/Drupal/Component/Uuid/Tests/UuidTest.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Uuid/UuidTest.php rename to core/lib/Drupal/Component/Uuid/Tests/UuidTest.php diff --git a/core/lib/Drupal/Component/Uuid/composer.json b/core/lib/Drupal/Component/Uuid/composer.json index 8e9cced871..5be0b14705 100644 --- a/core/lib/Drupal/Component/Uuid/composer.json +++ b/core/lib/Drupal/Component/Uuid/composer.json @@ -1,20 +1,23 @@ { - "name": "drupal/core-uuid", - "description": "PHP library for reading PO files.", - "type": "library", - "license": "GPL-2.0-or-later", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "require": { - "php": ">=5.5.9", - "drupal/core-utility": "^8.2" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Uuid\\": "" + "name": "drupal/core-uuid", + "description": "PHP library for reading PO files.", + "type": "library", + "license": "GPL-2.0-or-later", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "require": { + "php": ">=5.5.9", + "drupal/core-utility": "^8.2" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Uuid\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] } - } -} +} \ No newline at end of file diff --git a/core/tests/TestSuites/TestSuiteBase.php b/core/tests/TestSuites/TestSuiteBase.php index 41ed61622b..0ad63f12a0 100644 --- a/core/tests/TestSuites/TestSuiteBase.php +++ b/core/tests/TestSuites/TestSuiteBase.php @@ -42,6 +42,11 @@ protected function addTestsBySuiteNamespace($root, $suite_namespace) { // to this is Unit tests for historical reasons. if ($suite_namespace == 'Unit') { $tests = TestDiscovery::scanDirectory("Drupal\\Tests\\", "$root/core/tests/Drupal/Tests"); + $components = glob("$root/core/lib/Drupal/Component/*", GLOB_ONLYDIR); + foreach ($components as $componentPath) { + $component = basename($componentPath); + $tests += TestDiscovery::scanDirectory("Drupal\\Tests\\Component\\$component\\" , $componentPath . '/Tests'); + } $tests = array_flip(array_filter(array_flip($tests), function ($test_class) { // The Listeners directory does not contain tests. Use the class name // to be compatible with all operating systems. diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php index 82a1830547..8e38c9e8ba 100644 --- a/core/tests/bootstrap.php +++ b/core/tests/bootstrap.php @@ -134,6 +134,13 @@ function drupal_phpunit_populate_class_loader() { $loader->add('Drupal\\FunctionalTests', __DIR__); $loader->add('Drupal\\FunctionalJavascriptTests', __DIR__); + // Add tests from drupal components. + $components = glob(__DIR__ . '/../lib/Drupal/Component/*', GLOB_ONLYDIR); + foreach ($components as $componentPath) { + $component = basename($componentPath); + $loader->addPsr4("Drupal\\Tests\\Component\\$component\\", $componentPath . '/Tests'); + } + if (!isset($GLOBALS['namespaces'])) { // Scan for arbitrary extension namespaces from core and contrib. $extension_roots = drupal_phpunit_contrib_extension_directory_roots();