#22 - bugfixes (also: #21, #14) (#23)

* #22 - double quote fixer bugfix * #21 - deprecation fix * #14 - missing dev-dependencies added * #22 - Docker removed from GHA
blumilksoftware · May 18, 2021 · fa02efc · fa02efc
1 parent d8e4a5b
commit fa02efc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/.env.example b/.env.example
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -13,9 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Run the Docker containers
-        run: docker-compose up -d
-
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
@@ -25,13 +22,13 @@ jobs:
             ${{ runner.os }}-composer-
 
       - name: Validate composer.json
-        run: docker-compose run php composer validate
+        run: composer validate
 
       - name: Install dependencies
-        run: docker-compose run php composer install --prefer-dist --no-progress --no-suggest
+        run: composer install --prefer-dist --no-progress
 
       - name: Run code style checker
-        run: docker-compose run php composer ecs
+        run: composer ecs
 
       - name: Run tests
-        run: docker-compose run php composer test
+        run: composer test
diff --git a/composer.json b/composer.json
@@ -5,7 +5,11 @@
   "type": "library",
   "require": {
     "php": "^8.0",
-    "symplify/easy-coding-standard": "^9.2"
+    "symplify/easy-coding-standard": "^9.3.12"
+  },
+  "require-dev": {
+    "jetbrains/phpstorm-attributes": "^1.0",
+    "phpunit/phpunit": "^9.5"
   },
   "authors": [
     {
@@ -26,8 +30,5 @@
     "ecs": "./vendor/bin/ecs check",
     "ecsf": "./vendor/bin/ecs check --fix",
     "test": "./vendor/bin/phpunit tests --colors always"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^9.5"
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,6 @@ services:
     image: ghcr.io/blumilksoftware/php:8.0.3.1
     container_name: blumilk-codestyle-php
     working_dir: /application
-    user: ${CURRENT_UID}
+    user: ${CURRENT_UID:-1000}
     volumes:
       - .:/application
diff --git a/src/Config.php b/src/Config.php
@@ -13,7 +13,6 @@
 use Blumilk\Codestyle\Configuration\SetLists;
 use Blumilk\Codestyle\Configuration\SkippedRules;
 use JetBrains\PhpStorm\ArrayShape;
-use JetBrains\PhpStorm\Pure;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator as Container;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 
@@ -24,7 +23,6 @@ class Config
     protected SkippedRules $skipped;
     protected AdditionalRules $rules;
 
-    #[Pure]
     public function __construct(
         ?Paths $paths = null,
         ?SetLists $sets = null,
@@ -43,10 +41,13 @@ public function config(): callable
 
         return static function (Container $container) use ($sets, $skipped, $rules, $paths): void {
             $parameters = $container->parameters();
-            $parameters->set(Option::SETS, $sets);
             $parameters->set(Option::SKIP, $skipped);
             $parameters->set(Option::PATHS, $paths);
 
+            foreach ($sets as $set) {
+                $container->import($set);
+            }
+
             $services = $container->services();
             foreach ($rules as $rule => $configuration) {
                 $service = $services->set($rule);

diff --git a/src/Fixers/DoubleQuoteFixer.php b/src/Fixers/DoubleQuoteFixer.php
@@ -7,6 +7,7 @@
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use SplFileInfo;
 
@@ -34,12 +35,13 @@ public function isCandidate(Tokens $tokens): bool
 
     protected function applyFix(SplFileInfo $file, Tokens $tokens): void
     {
-        foreach ($tokens as $token) {
+        foreach ($tokens as $index => $token) {
             if (!$token->isGivenKind(T_CONSTANT_ENCAPSED_STRING)) {
                 continue;
             }
 
             $content = $token->getContent();
+            $prefix = "";
             if (
                 $content[0] === "'" &&
                 !str_contains($content, '"') &&
@@ -49,7 +51,8 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void
                 $content = substr($content, 1, -1);
                 $content = str_replace("\\'", "'", $content);
                 $content = str_replace("\\$", "$", $content);
-                $token->setContent("\"" . $content . "\"");
+
+                $tokens[$index] = new Token([T_CONSTANT_ENCAPSED_STRING, $prefix . "\"" . $content . "\""]);
             }
         }
     }