8000 minor #27947 Rename Contract to Contracts (fabpot) · fancyweb/symfony@e379146 · GitHub
[go: up one dir, main page]
Skip to content

Commit e379146

Browse files
fabpotfabpot
committed
minor symfony#27947 Rename Contract to Contracts (fabpot)
This PR was merged into the 4.2-dev branch. Discussion ---------- Rename Contract to Contracts | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a To avoid confusions between the composer name and the namespace. Commits ------- 682836d renamed Contract to Contracts
2 parents 1e16a8b + 682836d commit e379146

File tree

30 files changed

+25
-25
lines changed

30 files changed

+25
-25
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
121121
"Symfony\\Bundle\\": "src/Symfony/Bundle/",
122122
"Symfony\\Component\\": "src/Symfony/Component/",
123-
"Symfony\\Contract\\": "src/Symfony/Contract/"
123+
"Symfony\\Contracts\\": "src/Symfony/Contracts/"
124124
},
125125
"classmap": [
126126
"src/Symfony/Component/Intl/Resources/stubs"

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Symfony\Component\Form\FormBuilderInterface;
2525
use Symfony\Component\OptionsResolver\Options;
2626
use Symfony\Component\OptionsResolver\OptionsResolver;
27-
use Symfony\Contract\Service\ResetInterface;
27+
use Symfony\Contracts\Service\ResetInterface;
2828

2929
abstract class DoctrineType extends AbstractType implements ResetInterface
3030
{

‎src/Symfony/Bridge/Monolog/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Monolog\Logger as BaseLogger;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
17-
use Symfony\Contract\Service\ResetInterface;
17+
use Symfony\Contracts\Service\ResetInterface;
1818

1919
/**
2020
* Logger.

‎src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\RequestStack;
1717
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
18-
use Symfony\Contract\Service\ResetInterface;
18+
use Symfony\Contracts\Service\ResetInterface;
1919

2020
class DebugProcessor implements DebugLoggerInterface, ResetInterface
2121
{

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
use Symfony\Component\Workflow;
9595
use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand;
9696
use Symfony\Component\Yaml\Yaml;
97-
use Symfony\Contract\Service\ResetInterface;
97+
use Symfony\Contracts\Service\ResetInterface;
9898

9999
/**
100100
* FrameworkExtension.

‎src/Symfony/Component/Cache/Adapter/ChainAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Symfony\Component\Cache\PruneableInterface;
2020
use Symfony\Component\Cache\ResettableInterface;
2121
use Symfony\Component\Cache\Traits\GetTrait;
22-
use Symfony\Contract\Service\ResetInterface;
22+
use Symfony\Contracts\Service\ResetInterface;
2323

2424
/**
2525
* Chains several adapters together.

‎src/Symfony/Component/Cache/Adapter/TraceableAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Cache\CacheItem;
1717
use Symfony\Component\Cache\PruneableInterface;
1818
use Symfony\Component\Cache\ResettableInterface;
19-
use Symfony\Contract\Service\ResetInterface;
19+
use Symfony\Contracts\Service\ResetInterface;
2020

2121
/**
2222
* An adapter that collects data about all cache calls.

‎src/Symfony/Component/Cache/DoctrineProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Doctrine\Common\Cache\CacheProvider;
1515
use Psr\Cache\CacheItemPoolInterface;
16-
use Symfony\Contract\Service\ResetInterface;
16+
use Symfony\Contracts\Service\ResetInterface;
1717

1818
/**
1919
* @author Nicolas Grekas <p@tchwork.com>

‎src/Symfony/Component/Cache/ResettableInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Cache;
1313

14-
use Symfony\Contract\Service\ResetInterface;
14+
use Symfony\Contracts\Service\ResetInterface;
1515

1616
/**
1717
* Resets a pool's local state.

‎src/Symfony/Component/Cache/Simple/ChainCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Cache\Exception\InvalidArgumentException;
1616
use Symfony\Component\Cache\PruneableInterface;
1717
use Symfony\Component\Cache\ResettableInterface;
18-
use Symfony\Contract\Service\ResetInterface;
18+
use Symfony\Contracts\Service\ResetInterface;
1919

2020
/**
2121
* Chains several caches together.

‎src/Symfony/Component/Cache/Simple/TraceableCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\SimpleCache\CacheInterface;
1515
use Symfony\Component\Cache\PruneableInterface;
1616
use Symfony\Component\Cache\ResettableInterface;
17-
use Symfony\Contract\Service\ResetInterface;
17+
use Symfony\Contracts\Service\ResetInterface;
1818

1919
/**
2020
* An adapter that collects data about all cache calls.

‎src/Symfony/Component/Cache/Traits/ProxyTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Cache\Traits;
1313

1414
use Symfony\Component\Cache\PruneableInterface;
15-
use Symfony\Contract\Service\ResetInterface;
15+
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
1818
* @author Nicolas Grekas <p@tchwork.com>

‎src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Console\Formatter;
1313

1414
use Symfony\Component\Console\Exception\InvalidArgumentException;
15-
use Symfony\Contract\Service\ResetInterface;
15+
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
1818
* @author Jean-François Simon <contact@jfsimon.fr>

‎src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\DependencyInjection;
1313

14-
use Symfony\Contract\Service\ResetInterface;
14+
use Symfony\Contracts\Service\ResetInterface;
1515

1616
/**
1717
* ResettableContainerInterface defines additional resetting functionality

‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\EventDispatcher\Debug;
1313

1414
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
15-
use Symfony\Contract\Service\ResetInterface;
15+
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
1818
* @deprecated since Symfony 4.1

‎src/Symfony/Component/ExpressionLanguage/Compiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\ExpressionLanguage;
1313

14-
use Symfony\Contract\Service\ResetInterface;
14+
use Symfony\Contracts\Service\ResetInterface;
1515

1616
/**
1717
* Compiles a node to PHP code.

‎src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\HttpFoundation\Response;
16-
use Symfony\Contract\Service\ResetInterface;
16+
use Symfony\Contracts\Service\ResetInterface;
1717

1818
/**
1919
* DataCollectorInterface.

‎src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpFoundation\Response;
19-
use Symfony\Contract\Service\ResetInterface;
19+
use Symfony\Contracts\Service\ResetInterface;
2020

2121
/**
2222
* EventDataCollector.

‎src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\HttpKernel\DependencyInjection;
1313

14-
use Symfony\Contract\Service\ResetInterface;
14+
use Symfony\Contracts\Service\ResetInterface;
1515

1616
/**
1717
* Resets provided services.

‎src/Symfony/Component/HttpKernel/Profiler/Profiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\HttpFoundation\Response;
1717
use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
1818
use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
19-
use Symfony\Contract\Service\ResetInterface;
19+
use Symfony\Contracts\Service\ResetInterface;
2020
use Psr\Log\LoggerInterface;
2121

2222
/**

‎src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Security\Core\Authentication\Token\Storage;
1313

1414
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
15-
use Symfony\Contract\Service\ResetInterface;
15+
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
1818
* TokenStorage contains a TokenInterface.

‎src/Symfony/Component/Stopwatch/Stopwatch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Stopwatch;
1313

14-
use Symfony\Contract\Service\ResetInterface;
14+
use Symfony\Contracts\Service\ResetInterface;
1515

1616
/**
1717
* Stopwatch provides a way to profile code.

‎src/Symfony/Component/Validator/Validator/TraceableValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Validator\Validator;
1313

1414
use Symfony\Component\Validator\Context\ExecutionContextInterface;
15-
use Symfony\Contract\Service\ResetInterface;
15+
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
1818
* Collects some data about validator calls.

‎src/Symfony/Contract/.gitignore renamed to ‎src/Symfony/Contracts/.gitignore

File renamed without changes.

‎src/Symfony/Contract/CHANGELOG.md renamed to ‎src/Symfony/Contracts/CHANGELOG.md

File renamed without changes.

‎src/Symfony/Contract/LICENSE renamed to ‎src/Symfony/Contracts/LICENSE

File renamed without changes.

‎src/Symfony/Contract/README.md renamed to ‎src/Symfony/Contracts/README.md

File renamed without changes.

‎src/Symfony/Contract/Service/ResetInterface.php renamed to ‎src/Symfony/Contracts/Service/ResetInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Contract\Service;
12+
namespace Symfony\Contracts\Service;
1313

1414
/**
1515
* Provides a way to reset an object to its initial state.

‎src/Symfony/Contract/composer.json renamed to ‎src/Symfony/Contracts/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^7.1.3"
2020
},
2121
"autoload": {
22-
"psr-4": { "Symfony\\Contract\\": "" },
22+
"psr-4": { "Symfony\\Contracts\\": "" },
2323
"exclude-from-classmap": [
2424
"**/Tests/"
2525
]

‎src/Symfony/Contract/phpunit.xml.dist renamed to ‎src/Symfony/Contracts/phpunit.xml.dist

File renamed without changes.

0 commit comments

Comments
 (0)
0