diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml index 84eacbe..c6b26f0 100644 --- a/.symfony.bundle.yaml +++ b/.symfony.bundle.yaml @@ -1,4 +1,12 @@ -branches: ["3.3.x", "3.4.x", "3.5.x", "3.6.x"] -maintained_branches: ["3.5.x", "3.6.x"] -doc_dir: {"3.5.x": "Resources/doc/", "3.6.x": "docs/"} -dev_branch: "3.6.x" +branches: + - "3.3.x" + - "3.4.x" + - "3.5.x" + - "3.6.x" + - "3.7.x" +maintained_branches: + - "3.5.x" + - "3.6.x" + - "3.7.x" +doc_dir: "docs/" +dev_branch: "3.7.x" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index a948ea6..bd05ce9 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,29 +1,5 @@ parameters: - excludePaths: - # Contains an error that is impossible to ignore - - tests/IntegrationTest.php - ignoreErrors: - - - message: "#^Call to an undefined method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyFixturesLoader\\:\\:getFixture\\(\\)\\.$#" - count: 1 - path: src/Loader/SymfonyFixturesLoader.php - - - - message: "#^Call to an undefined static method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyBridgeLoader\\:\\:addFixture\\(\\)\\.$#" - count: 1 - path: src/Loader/SymfonyFixturesLoader.php - - - - message: "#^Call to an undefined static method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyBridgeLoader\\:\\:getFixtures\\(\\)\\.$#" - count: 1 - path: src/Loader/SymfonyFixturesLoader.php - - - - message: "#^Class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyFixturesLoader does not have a constructor and must be instantiated without any parameters\\.$#" - count: 2 - path: tests/Command/LoadDataFixturesDoctrineCommandTest.php - - message: "#^Constructor of class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Tests\\\\Fixtures\\\\FooBundle\\\\DataFixtures\\\\RequiredConstructorArgsFixtures has an unused parameter \\$fooRequiredArg\\.$#" count: 1 diff --git a/src/DependencyInjection/DoctrineFixturesExtension.php b/src/DependencyInjection/DoctrineFixturesExtension.php index 9a56444..8d13be4 100644 --- a/src/DependencyInjection/DoctrineFixturesExtension.php +++ b/src/DependencyInjection/DoctrineFixturesExtension.php @@ -8,8 +8,8 @@ use Doctrine\Bundle\FixturesBundle\ORMFixtureInterface; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; use function dirname;