diff --git a/.travis.yml b/.travis.yml index 5f8601054..3b1aed27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,6 @@ jobs: - stage: Code Quality env: CODING_STANDARDS php: 7.1 - install: - - travis_retry composer require -n --prefer-dist --dev doctrine/coding-standard:^5.0 script: - ./vendor/bin/phpcs diff --git a/Command/Proxy/CollectionRegionDoctrineCommand.php b/Command/Proxy/CollectionRegionDoctrineCommand.php index 1f5cba952..d12614537 100644 --- a/Command/Proxy/CollectionRegionDoctrineCommand.php +++ b/Command/Proxy/CollectionRegionDoctrineCommand.php @@ -30,5 +30,4 @@ protected function execute(InputInterface $input, OutputInterface $output) return parent::execute($input, $output); } - } diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php index b8cb56d9e..6fddfd485 100644 --- a/DataCollector/DoctrineDataCollector.php +++ b/DataCollector/DoctrineDataCollector.php @@ -10,7 +10,6 @@ use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Tools\SchemaValidator; -use Doctrine\ORM\Version; use Exception; use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector as BaseCollector; use Symfony\Component\HttpFoundation\Request; diff --git a/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php b/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php index 50d838cc0..988155741 100644 --- a/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php +++ b/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php @@ -5,7 +5,6 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Reference; final class ServiceRepositoryCompilerPass implements CompilerPassInterface diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php index 96fac3e16..e9c03b594 100644 --- a/DependencyInjection/DoctrineExtension.php +++ b/DependencyInjection/DoctrineExtension.php @@ -10,7 +10,6 @@ use Doctrine\ORM\Version; use LogicException; use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension; -use Symfony\Bridge\Doctrine\Form\Type\DoctrineType; use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware; use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; use Symfony\Component\Config\FileLocator; @@ -18,14 +17,11 @@ use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\DefinitionDecorator; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\ServiceLocator; -use Symfony\Component\Form\AbstractType; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface; use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface; /** diff --git a/Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php index fdb7c38da..ae668e097 100644 --- a/Repository/ContainerRepositoryFactory.php +++ b/Repository/ContainerRepositoryFactory.php @@ -10,7 +10,6 @@ use InvalidArgumentException; use Psr\Container\ContainerInterface; use RuntimeException; -use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass; /** * Fetches repositories from the container or falls back to normal creation. diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php index 58da728ee..073ecb0c7 100644 --- a/Tests/ContainerTest.php +++ b/Tests/ContainerTest.php @@ -4,8 +4,6 @@ use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Version; -use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor; -use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface; use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface; class ContainerTest extends TestCase diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index 71c9bfcaa..1f24100bd 100644 --- a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -5,12 +5,10 @@ use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\EntityListenerPass; use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Version; use PHPUnit\Framework\TestCase; use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass; -use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php index 8b3277800..cd20392d6 100644 --- a/Tests/DependencyInjection/DoctrineExtensionTest.php +++ b/Tests/DependencyInjection/DoctrineExtensionTest.php @@ -10,10 +10,8 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\Connection as DriverConnection; use Doctrine\ORM\EntityManagerInterface; -use Doctrine\ORM\Version; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass; -use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; diff --git a/Tests/Mapping/ContainerAwareEntityListenerResolverTest.php b/Tests/Mapping/ContainerAwareEntityListenerResolverTest.php index 75983ad12..696c77419 100644 --- a/Tests/Mapping/ContainerAwareEntityListenerResolverTest.php +++ b/Tests/Mapping/ContainerAwareEntityListenerResolverTest.php @@ -3,7 +3,6 @@ namespace Doctrine\Bundle\DoctrineBundle\Tests\Mapping; use Doctrine\Bundle\DoctrineBundle\Mapping\ContainerAwareEntityListenerResolver; -use Doctrine\ORM\Mapping\EntityListenerResolver; use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/Tests/ProfilerTest.php b/Tests/ProfilerTest.php index b78424663..8391a36f2 100644 --- a/Tests/ProfilerTest.php +++ b/Tests/ProfilerTest.php @@ -14,7 +14,6 @@ use Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector; use Symfony\Component\HttpKernel\Fragment\FragmentHandler; use Symfony\Component\HttpKernel\Profiler\Profile; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/Tests/ServiceRepositoryTest.php b/Tests/ServiceRepositoryTest.php index f39f4d8fa..21754f707 100644 --- a/Tests/ServiceRepositoryTest.php +++ b/Tests/ServiceRepositoryTest.php @@ -15,9 +15,7 @@ use Fixtures\Bundles\RepositoryServiceBundle\Repository\TestCustomClassRepoRepository; use Fixtures\Bundles\RepositoryServiceBundle\Repository\TestCustomServiceRepoRepository; use Fixtures\Bundles\RepositoryServiceBundle\RepositoryServiceBundle; -use RuntimeException; use Symfony\Component\DependencyInjection\Alias; -use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; diff --git a/Tests/TestCase.php b/Tests/TestCase.php index a2c2ac793..09a976f3a 100644 --- a/Tests/TestCase.php +++ b/Tests/TestCase.php @@ -9,7 +9,6 @@ use PHPUnit\Framework\TestCase as BaseTestCase; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass; -use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; diff --git a/composer.json b/composer.json index a8c725014..3910633e8 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,8 @@ "twig/twig": "^1.26|^2.0", "php-coveralls/php-coveralls": "^2.1", "phpunit/phpunit": "7.0", - "symfony/web-profiler-bundle": "^3.4|^4.1" + "symfony/web-profiler-bundle": "^3.4|^4.1", + "doctrine/coding-standard": "^5.0" }, "conflict": { "doctrine/orm": "<2.6"