From b13a9038b8f76d5779c0dc1476b94b5cb6ec6548 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Mon, 24 Aug 2020 21:43:31 +0200 Subject: [PATCH 1/3] =?UTF-8?q?It=20has=20been=20=20=CC=B55=CC=B5=200=20da?= =?UTF-8?q?ys=20since=20ECS=20last=20broke=20Travis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DataFixtures/TaxonomyFixtures.php | 3 ++- src/Extension/ExtensionCompilerPass.php | 9 +++++---- symfony.lock | 3 --- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/DataFixtures/TaxonomyFixtures.php b/src/DataFixtures/TaxonomyFixtures.php index 1c0677cbc..232db6058 100644 --- a/src/DataFixtures/TaxonomyFixtures.php +++ b/src/DataFixtures/TaxonomyFixtures.php @@ -65,7 +65,8 @@ private function loadTaxonomies(ObjectManager $manager): void private function getDefaultOptions(): array { - $options = ['action', 'adult', 'adventure', 'alpha', 'animals', 'animation', 'anime', 'architecture', 'art', + $options = [ + 'action', 'adult', 'adventure', 'alpha', 'animals', 'animation', 'anime', 'architecture', 'art', 'astronomy', 'baby', 'batshitinsane', 'biography', 'biology', 'book', 'books', 'business', 'camera', 'cars', 'cats', 'cinema', 'classic', 'comedy', 'comics', 'computers', 'cookbook', 'cooking', 'crime', 'culture', 'dark', 'design', 'digital', 'documentary', 'dogs', 'drama', 'drugs', 'education', diff --git a/src/Extension/ExtensionCompilerPass.php b/src/Extension/ExtensionCompilerPass.php index 5eba66cae..d7295f1de 100644 --- a/src/Extension/ExtensionCompilerPass.php +++ b/src/Extension/ExtensionCompilerPass.php @@ -72,10 +72,11 @@ private function createService(string $package): array $namespace = Str::removeLast($reflection->getName(), Str::splitLast($reflection->getName(), '\\')); $path = $this->getRelativePath($package); - return [$namespace, [ - 'resource' => $path . '/*', - 'exclude' => $path . '/{Entity,Exception}', - ]]; + return [ + $namespace, [ + 'resource' => $path . '/*', + 'exclude' => $path . '/{Entity,Exception}', + ]]; } private function addComposerPackages(array $packages): array diff --git a/symfony.lock b/symfony.lock index bdfff430b..40ef29f48 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1059,9 +1059,6 @@ "symplify/package-builder": { "version": "v7.2.2" }, - "symplify/phpstan-extensions": { - "version": "v7.3.18" - }, "symplify/set-config-resolver": { "version": "v7.2.2" }, From f4c783be173eb807d741893233c3034e2b096a92 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Tue, 25 Aug 2020 10:03:03 +0200 Subject: [PATCH 2/3] Update ExtensionCompilerPass.php --- src/Extension/ExtensionCompilerPass.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Extension/ExtensionCompilerPass.php b/src/Extension/ExtensionCompilerPass.php index d7295f1de..ef228e386 100644 --- a/src/Extension/ExtensionCompilerPass.php +++ b/src/Extension/ExtensionCompilerPass.php @@ -76,7 +76,8 @@ private function createService(string $package): array $namespace, [ 'resource' => $path . '/*', 'exclude' => $path . '/{Entity,Exception}', - ]]; + ], + ]; } private function addComposerPackages(array $packages): array From dbbe1ac38baa6cc2caabd60ef1ce810048c09729 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Tue, 25 Aug 2020 11:45:34 +0200 Subject: [PATCH 3/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c3f32805..807d1d838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_script: script: # this checks that the source code follows the Bolt Code Syntax rules - - ./vendor/bin/ecs check + - php -d memory_limit=2G vendor/bin/ecs check src - ./vendor/bin/phpstan analyse -c phpstan.neon src # run EsLint on Javascript files - npm run lint