Refactoring code to be php 7.1 compatible

Author: weaverryan

src/Command/RecipesCommand.php

@@ -13,7 +13,6 @@
 
 use Composer\Command\BaseCommand;
 use Composer\Downloader\TransportException;
-use Composer\Util\HttpDownloader;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

src/Command/UpdateRecipesCommand.php

@@ -33,10 +33,10 @@ class UpdateRecipesCommand extends BaseCommand
 {
     /** @var Flex */
     private $flex;
-    private Downloader $downloader;
-    private Configurator $configurator;
-    private string $rootDir;
-    private GithubApi $githubApi;
+    private $downloader;
+    private $configurator;
+    private $rootDir;
+    private $githubApi;
 
     public function __construct(/* cannot be type-hinted */ $flex, Downloader $downloader, HttpDownloader $httpDownloader, Configurator $configurator, string $rootDir)
     {
@@ -234,7 +234,7 @@ private function getRecipe(string $packageName, string $recipeRef = null, string
             $packageName,
             $operation->getOperationType(),
             $recipes['manifests'][$packageName],
-            $recipes['locks'][$packageName] ?? [],
+            $recipes['locks'][$packageName] ?? []
         );
     }
 
@@ -264,7 +264,7 @@ private function generateChangelog(Recipe $originalRecipe): ?array
         $recipeVersions = $this->githubApi->getVersionsOfRecipe(
             $recipeData['repo'],
             $recipeData['branch'],
-            $originalRecipe->getName(),
+            $originalRecipe->getName()
         );
         if (!$recipeVersions) {
             return null;

src/Configurator/ComposerScriptsConfigurator.php

@@ -53,11 +53,11 @@ public function update(RecipeUpdate $recipeUpdate, array $originalConfig, array
 
         $recipeUpdate->setOriginalFile(
             $jsonPath,
-            $this->configureScripts($originalConfig, $json),
+            $this->configureScripts($originalConfig, $json)
         );
         $recipeUpdate->setNewFile(
             $jsonPath,
-            $this->configureScripts($newConfig, $json),
+            $this->configureScripts($newConfig, $json)
         );
     }
 

src/Configurator/CopyFromPackageConfigurator.php

@@ -47,7 +47,7 @@ public function update(RecipeUpdate $recipeUpdate, array $originalConfig, array
                 // path is in both, we cannot update
                 $recipeUpdate->addCopyFromPackagePath(
                     $packageDir.'/'.$source,
-                    $this->options->expandTargetDir($target),
+                    $this->options->expandTargetDir($target)
                 );
 
                 unset($newConfig[$source]);

src/GithubApi.php

@@ -15,7 +15,7 @@
 
 class GithubApi
 {
-    private HttpDownloader $downloader;
+    private $downloader;
 
     public function __construct(HttpDownloader $downloader)
     {

src/InformationOperation.php

@@ -10,9 +10,9 @@
  */
 class InformationOperation implements OperationInterface
 {
-    private PackageInterface $package;
-    private ?string $recipeRef = null;
-    private ?string $version = null;
+    private $package;
+    private $recipeRef = null;
+    private $version = null;
 
     public function __construct(PackageInterface $package)
     {

src/Update/RecipePatch.php

@@ -13,8 +13,8 @@
 
 class RecipePatch
 {
-    private string $patch;
-    private array $blobs;
+    private $patch;
+    private $blobs;
 
     public function __construct(string $patch, array $blobs)
     {

src/Update/RecipePatcher.php

@@ -18,10 +18,10 @@
 
 class RecipePatcher
 {
-    private string $rootDir;
-    private Filesystem $filesystem;
-    private IOInterface $io;
-    private ProcessExecutor $processExecutor;
+    private $rootDir;
+    private $filesystem;
+    private $io;
+    private $processExecutor;
 
     public function __construct(string $rootDir, IOInterface $io)
     {

src/Update/RecipeUpdate.php

@@ -16,16 +16,16 @@
 
 class RecipeUpdate
 {
-    private Recipe $originalRecipe;
-    private Recipe $newRecipe;
-    private Lock $lock;
-    private string $rootDir;
+    private $originalRecipe;
+    private $newRecipe;
+    private $lock;
+    private $rootDir;
 
     /** @var string[] */
-    private array $originalRecipeFiles = [];
+    private $originalRecipeFiles = [];
     /** @var string[] */
-    private array $newRecipeFiles = [];
-    private array $copyFromPackagePaths = [];
+    private $newRecipeFiles = [];
+    private $copyFromPackagePaths = [];
 
     public function __construct(Recipe $originalRecipe, Recipe $newRecipe, Lock $lock, string $rootDir)
     {

tests/Configurator/ComposerScriptsConfiguratorTest.php

@@ -158,7 +158,7 @@ public function testUpdate()
         $configurator->update(
             $recipeUpdate,
             ['cache:clear' => 'symfony-cmd'],
-            ['cache:clear' => 'other-cmd', 'do:cool-stuff' => 'symfony-cmd'],
+            ['cache:clear' => 'other-cmd', 'do:cool-stuff' => 'symfony-cmd']
         );
 
         $this->assertSame(['composer.json' => <<<EOF

tests/Configurator/ContainerConfiguratorTest.php

@@ -327,7 +327,7 @@ public function testUpdate()
         $configurator->update(
             $recipeUpdate,
             ['locale' => 'en', 'foobar' => 'baz'],
-            ['locale' => 'fr', 'foobar' => 'baz', 'new_one' => 'hallo'],
+            ['locale' => 'fr', 'foobar' => 'baz', 'new_one' => 'hallo']
         );
 
         $this->assertSame(['config/services.yaml' => <<<EOF

tests/Configurator/CopyDirectoryFromPackageConfiguratorTest.php

@@ -125,7 +125,7 @@ public function testUpdate()
         $configurator->update(
             $recipeUpdate,
             ['package/files1/' => 'target/files1/', 'package/files2/' => 'target/files2/'],
-            ['package/files1/' => 'target/files1/', 'package/files3/' => 'target/files3/'],
+            ['package/files1/' => 'target/files1/', 'package/files3/' => 'target/files3/']
         );
 
         // original files always show as empty: we don't know what they are

tests/Configurator/DockerComposeConfiguratorTest.php

@@ -729,7 +729,7 @@ public function testUpdate()
                         'MY_DATABASE:',
                     ],
                 ],
-            ],
+            ]
         );
 
         $this->assertSame(['docker-compose.yml' => <<<EOF

tests/Configurator/DockerfileConfiguratorTest.php

@@ -228,7 +228,7 @@ public function testUpdate()
         $configurator->update(
             $recipeUpdate,
             ['RUN docker-php-ext-install pdo_dummyv1'],
-            ['RUN docker-php-ext-install pdo_dummyv2'],
+            ['RUN docker-php-ext-install pdo_dummyv2']
         );
 
         $this->assertSame(['Dockerfile' => <<<EOF

tests/Configurator/EnvConfiguratorTest.php

@@ -381,7 +381,7 @@ public function testUpdate()
             $recipeUpdate,
             // %generate(secret)% should not regenerate a new value
             ['APP_ENV' => 'original', 'APP_SECRET' => '%generate(secret)%', 'APP_DEBUG' => 0, 'EXTRA_VAR' => 'apple'],
-            ['APP_ENV' => 'updated', 'APP_SECRET' => '%generate(secret)%', 'APP_DEBUG' => 0, 'NEW_VAR' => 'orange'],
+            ['APP_ENV' => 'updated', 'APP_SECRET' => '%generate(secret)%', 'APP_DEBUG' => 0, 'NEW_VAR' => 'orange']
         );
 
         $this->assertSame(['.env' => <<<EOF

tests/Configurator/GitignoreConfiguratorTest.php

@@ -180,7 +180,7 @@ public function testUpdate()
         $configurator->update(
             $recipeUpdate,
             ['/.env.local', '/.env.local.php', '/.env.*.local', '/vendor/'],
-            ['/.env.LOCAL', '/.env.LOCAL.php', '/.env.*.LOCAL', '/%VAR_DIR%/'],
+            ['/.env.LOCAL', '/.env.LOCAL.php', '/.env.*.LOCAL', '/%VAR_DIR%/']
         );
 
         $this->assertSame(['.gitignore' => <<<EOF

tests/Configurator/MakefileConfiguratorTest.php

@@ -188,7 +188,7 @@ public function testUpdate()
                 'ifndef CONSOLE',
                 '    @printf "Run composer require cli to install the Symfony console."',
                 'endif',
-            ],
+            ]
         );
 
         $this->assertSame(['Makefile' => <<<EOF

tests/Update/RecipeUpdateTest.php

@@ -20,9 +20,9 @@ class RecipeUpdateTest extends TestCase
 {
     private $originalRecipe;
     private $newRecipe;
-    private Lock $lock;
-    private string $rootDir;
-    private RecipeUpdate $update;
+    private $lock;
+    private $rootDir;
+    private $update;
 
     protected function setUp(): void
     {