diff --git a/composer.json b/composer.json index a53a578f8a..86c2dd6fd8 100644 --- a/composer.json +++ b/composer.json @@ -120,7 +120,7 @@ "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", "Symfony\\Bundle\\": "src/Symfony/Bundle/", "Symfony\\Component\\": "src/Symfony/Component/", - "Symfony\\Contract\\": "src/Symfony/Contract/" + "Symfony\\Contracts\\": "src/Symfony/Contracts/" }, "classmap": [ "src/Symfony/Component/Intl/Resources/stubs" diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index acb4fa1225..547a70adab 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -24,7 +24,7 @@ use Symfony\Component\Form\Exception\RuntimeException; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; abstract class DoctrineType extends AbstractType implements ResetInterface { diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php index f735ff0cf2..ba5caf06ea 100644 --- a/src/Symfony/Bridge/Monolog/Logger.php +++ b/src/Symfony/Bridge/Monolog/Logger.php @@ -14,7 +14,7 @@ namespace Symfony\Bridge\Monolog; use Monolog\Logger as BaseLogger; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Logger. diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php index fc44b39234..13f8a2de3e 100644 --- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php @@ -15,7 +15,7 @@ use Monolog\Logger; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; class DebugProcessor implements DebugLoggerInterface, ResetInterface { diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 17913847b4..a3953a246f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -94,7 +94,7 @@ use Symfony\Component\WebLink\HttpHeaderSerializer; use Symfony\Component\Workflow; use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand; use Symfony\Component\Yaml\Yaml; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * FrameworkExtension. diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php index f573afe1af..8b737d43f7 100644 --- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php @@ -19,7 +19,7 @@ use Symfony\Component\Cache\Exception\InvalidArgumentException; use Symfony\Component\Cache\PruneableInterface; use Symfony\Component\Cache\ResettableInterface; use Symfony\Component\Cache\Traits\GetTrait; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Chains several adapters together. diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php index 12ce429429..5ccbdb00ba 100644 --- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php @@ -16,7 +16,7 @@ use Symfony\Component\Cache\CacheInterface; use Symfony\Component\Cache\CacheItem; use Symfony\Component\Cache\PruneableInterface; use Symfony\Component\Cache\ResettableInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * An adapter that collects data about all cache calls. diff --git a/src/Symfony/Component/Cache/DoctrineProvider.php b/src/Symfony/Component/Cache/DoctrineProvider.php index 01ce9daf02..3cc186962e 100644 --- a/src/Symfony/Component/Cache/DoctrineProvider.php +++ b/src/Symfony/Component/Cache/DoctrineProvider.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Cache; use Doctrine\Common\Cache\CacheProvider; use Psr\Cache\CacheItemPoolInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * @author Nicolas Grekas diff --git a/src/Symfony/Component/Cache/ResettableInterface.php b/src/Symfony/Component/Cache/ResettableInterface.php index 79d0b54849..7b0a853f23 100644 --- a/src/Symfony/Component/Cache/ResettableInterface.php +++ b/src/Symfony/Component/Cache/ResettableInterface.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Cache; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Resets a pool's local state. diff --git a/src/Symfony/Component/Cache/Simple/ChainCache.php b/src/Symfony/Component/Cache/Simple/ChainCache.php index 82032cde9e..d3d575a661 100644 --- a/src/Symfony/Component/Cache/Simple/ChainCache.php +++ b/src/Symfony/Component/Cache/Simple/ChainCache.php @@ -15,7 +15,7 @@ use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\Exception\InvalidArgumentException; use Symfony\Component\Cache\PruneableInterface; use Symfony\Component\Cache\ResettableInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Chains several caches together. diff --git a/src/Symfony/Component/Cache/Simple/TraceableCache.php b/src/Symfony/Component/Cache/Simple/TraceableCache.php index d119a54961..d6ed40f443 100644 --- a/src/Symfony/Component/Cache/Simple/TraceableCache.php +++ b/src/Symfony/Component/Cache/Simple/TraceableCache.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Cache\Simple; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\PruneableInterface; use Symfony\Component\Cache\ResettableInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * An adapter that collects data about all cache calls. diff --git a/src/Symfony/Component/Cache/Traits/ProxyTrait.php b/src/Symfony/Component/Cache/Traits/ProxyTrait.php index dea3843189..c86f360ab7 100644 --- a/src/Symfony/Component/Cache/Traits/ProxyTrait.php +++ b/src/Symfony/Component/Cache/Traits/ProxyTrait.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Cache\Traits; use Symfony\Component\Cache\PruneableInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * @author Nicolas Grekas diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php index 63715f369b..b0d3383d50 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Console\Formatter; use Symfony\Component\Console\Exception\InvalidArgumentException; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * @author Jean-François Simon diff --git a/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php b/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php index 6fb1d2ae31..32cf0e9b04 100644 --- a/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php +++ b/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php @@ -11,7 +11,7 @@ namespace Symfony\Component\DependencyInjection; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * ResettableContainerInterface defines additional resetting functionality diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php index 9781bdbb61..cd4d7470af 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php @@ -12,7 +12,7 @@ namespace Symfony\Component\EventDispatcher\Debug; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * @deprecated since Symfony 4.1 diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php index ca99d4e5ea..c048958518 100644 --- a/src/Symfony/Component/ExpressionLanguage/Compiler.php +++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php @@ -11,7 +11,7 @@ namespace Symfony\Component\ExpressionLanguage; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Compiles a node to PHP code. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php index 96d3b8f49a..b9584110ec 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php @@ -13,7 +13,7 @@ namespace Symfony\Component\HttpKernel\DataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * DataCollectorInterface. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php index 12f5084f0c..3a7e51bf8d 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php @@ -16,7 +16,7 @@ use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * EventDataCollector. diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php index 9af5e7934d..734fadbd74 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php @@ -11,7 +11,7 @@ namespace Symfony\Component\HttpKernel\DependencyInjection; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Resets provided services. diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index 6ecfd2a4be..0216133b78 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface; use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; use Psr\Log\LoggerInterface; /** diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php index 703badc2b0..f1f5391ba7 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Security\Core\Authentication\Token\Storage; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * TokenStorage contains a TokenInterface. diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php index 2b66d88da9..c203258e01 100644 --- a/src/Symfony/Component/Stopwatch/Stopwatch.php +++ b/src/Symfony/Component/Stopwatch/Stopwatch.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Stopwatch; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Stopwatch provides a way to profile code. diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php index a5e50ca4ac..e554b89faf 100644 --- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php +++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Validator\Validator; use Symfony\Component\Validator\Context\ExecutionContextInterface; -use Symfony\Contract\Service\ResetInterface; +use Symfony\Contracts\Service\ResetInterface; /** * Collects some data about validator calls. diff --git a/src/Symfony/Contract/.gitignore b/src/Symfony/Contracts/.gitignore similarity index 100% rename from src/Symfony/Contract/.gitignore rename to src/Symfony/Contracts/.gitignore diff --git a/src/Symfony/Contract/CHANGELOG.md b/src/Symfony/Contracts/CHANGELOG.md similarity index 100% rename from src/Symfony/Contract/CHANGELOG.md rename to src/Symfony/Contracts/CHANGELOG.md diff --git a/src/Symfony/Contract/LICENSE b/src/Symfony/Contracts/LICENSE similarity index 100% rename from src/Symfony/Contract/LICENSE rename to src/Symfony/Contracts/LICENSE diff --git a/src/Symfony/Contract/README.md b/src/Symfony/Contracts/README.md similarity index 100% rename from src/Symfony/Contract/README.md rename to src/Symfony/Contracts/README.md diff --git a/src/Symfony/Contract/Service/ResetInterface.php b/src/Symfony/Contracts/Service/ResetInterface.php similarity index 96% rename from src/Symfony/Contract/Service/ResetInterface.php rename to src/Symfony/Contracts/Service/ResetInterface.php index a99669c911..1af1075eee 100644 --- a/src/Symfony/Contract/Service/ResetInterface.php +++ b/src/Symfony/Contracts/Service/ResetInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Contract\Service; +namespace Symfony\Contracts\Service; /** * Provides a way to reset an object to its initial state. diff --git a/src/Symfony/Contract/composer.json b/src/Symfony/Contracts/composer.json similarity index 94% rename from src/Symfony/Contract/composer.json rename to src/Symfony/Contracts/composer.json index 2b515ef81c..9deed9d470 100644 --- a/src/Symfony/Contract/composer.json +++ b/src/Symfony/Contracts/composer.json @@ -19,7 +19,7 @@ "php": "^7.1.3" }, "autoload": { - "psr-4": { "Symfony\\Contract\\": "" }, + "psr-4": { "Symfony\\Contracts\\": "" }, "exclude-from-classmap": [ "**/Tests/" ] diff --git a/src/Symfony/Contract/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist similarity index 100% rename from src/Symfony/Contract/phpunit.xml.dist rename to src/Symfony/Contracts/phpunit.xml.dist