Fix code style

sulu · Aug 8, 2024 · 51f49f1 · 51f49f1
1 parent b755a9f
commit 51f49f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,8 +10,13 @@
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude(['Tests/Application/var/cache'])
-    ->in(__DIR__);
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->exclude([
+        'Application/var/',
+    ]);
 
 $config = new PhpCsFixer\Config();
 $config->setRiskyAllowed(true)

diff --git a/composer.json b/composer.json
@@ -37,7 +37,6 @@
     },
     "require-dev": {
         "coduo/php-matcher": "^6.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
         "handcraftedinthealps/zendsearch": "^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.0 || ^2.0",
         "jangregor/phpstan-prophecy": "^1.0",
@@ -63,10 +62,10 @@
     },
     "conflict": {
         "doctrine/doctrine-bundle": "2.3.0",
-        "sulu/automation-bundle": "<2.0, >=3.0",
-        "sulu/content-bundle": "<0.7, >=0.9",
-        "sulu/headless-bundle": "<0.8, >=0.11",
-        "sulu/messenger": "<0.1, >=0.3"
+        "sulu/automation-bundle": "<2.0 || >=3.0",
+        "sulu/content-bundle": "<0.7 || >=0.9",
+        "sulu/headless-bundle": "<0.8 || >=0.11",
+        "sulu/messenger": "<0.1 || >=0.3"
     },
     "suggest": {
         "sulu/automation-bundle": "Allows publish automation and outsource long-running route update processes."
@@ -108,8 +107,8 @@
         "php-cs": "@php vendor/bin/php-cs-fixer fix --verbose --diff --dry-run",
         "php-cs-fix": "@php vendor/bin/php-cs-fixer fix",
         "lint-composer": "@composer validate --strict",
-        "lint-twig": "@php tests/Application/bin/adminconsole lint:twig Resources/doc",
-        "lint-yaml": "@php tests/Application/bin/adminconsole lint:yaml Resources/config tests/Application/config",
+        "lint-twig": "@php tests/Application/bin/adminconsole lint:twig tests/Application/templates",
+        "lint-yaml": "@php tests/Application/bin/adminconsole lint:yaml config tests/Application/config",
         "lint-container": [
             "@php tests/Application/bin/adminconsole lint:container --env dev",
             "@php tests/Application/bin/websiteconsole lint:container --env dev",

diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php
@@ -17,8 +17,6 @@
 use Sulu\Component\HttpKernel\SuluKernel;
 use Sulu\Messenger\Infrastructure\Symfony\HttpKernel\SuluMessengerBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * AppKernel for functional tests.