Merge pull request #234 from Kharhamel/rectorFix

Fixed the rector bug

Author: Kharhamel

.github/workflows/auto-regenerate.yml

@@ -36,14 +36,6 @@ jobs:
         run: "composer install --no-interaction"
         working-directory: "generator"
 
-      - name: "Install dependencies with composer in root directory"
-        run: "composer install --no-interaction"
-
-  
-      - name: "Dump autoloader with composer in root directory"
-        run: "composer dump-autoload"
-
-  
       - name: "Regenerate files"
         run: "./safe.php generate"
         working-directory: "generator"

.github/workflows/continuous-integration.yml

@@ -99,10 +99,6 @@ jobs:
             exit 1;
           fi
 
-      - name: "Check if refactoring can be done with rector/rector:~0.7.0"
-        run: "composer install && composer rector && composer test"
-        working-directory: "generator/tests/rector/0.7"
-
       - name: "Archive code coverage results"
         uses: "actions/upload-artifact@v1"
         with:

.github/workflows/rector-continuous-integration.yml

@@ -0,0 +1,46 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "Rector Continuous Integration"
+
+on:
+  - "pull_request"
+  - "push"
+
+jobs:
+
+  rector-continuous-integration:
+    name: "Check if refactoring can be done with rector/rector:~0.7.0"
+
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+
+        dependencies:
+          - "highest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP with extensions"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Composer install"
+        run: "composer install && composer rector && composer test"
+        working-directory: "generator/tests/rector/0.7"
+
+      - name: "Run rector"
+        run: "composer rector"
+        working-directory: "generator/tests/rector/0.7"
+
+      - name: "Run tests"
+        run: "composer test"
+        working-directory: "generator/tests/rector/0.7"
+

generator/src/FileCreator.php

@@ -98,20 +98,29 @@ public function generateRectorFileForZeroPointSeven(array $functions, string $pa
         }
 
         $header = <<<'TXT'
+<?php
+
+declare(strict_types=1);
+
+use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
 # This file configures rector/rector:~0.7.0 to replace all PHP functions with their equivalent "safe" functions
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
 
-services:
-  Rector\Renaming\Rector\Function_\RenameFunctionRector:
-    $oldFunctionToNewFunction:
+    $services->set(RenameFunctionRector::class)
+        ->call('configure', [[ RenameFunctionRector::OLD_FUNCTION_TO_NEW_FUNCTION => [
 
 TXT;
 
         fwrite($stream, $header);
 
         foreach ($functionNames as $functionName) {
-            fwrite($stream, '      '.$functionName.": 'Safe\\".$functionName."'\n");
+            fwrite($stream, "            '$functionName' => 'Safe\\$functionName',\n");
         }
 
+        fwrite($stream, "]]]);\n};\n");
         fclose($stream);
     }
 

generator/src/GenerateCommand.php

@@ -37,7 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fileCreator = new FileCreator();
         $fileCreator->generatePhpFile($functions, __DIR__ . '/../../generated/');
         $fileCreator->generateFunctionsList($functions, __DIR__ . '/../../generated/functionsList.php');
-        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate-0.7.yml');
+        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate-0.7.php');
 
 
         $modules = [];

generator/tests/rector/0.7/composer.json

@@ -12,7 +12,7 @@
     "phpunit/phpunit": "^7"
   },
   "scripts": {
-    "rector": "rector process src/ --config ../../../../rector-migrate-0.7.yml",
+    "rector": "rector process src/ --config ../../../../rector-migrate-0.7.php",
     "test": "phpunit"
   }
 }