netresearch / kite

src/Workflow/Composer/Base.php

Doc Comments +2 added lines, -2 removed lines

@@ -365,8 +365,8 @@
     /**
      * Check that package is white-listed, is git-package and up-to-date
      *
-     * @param $package
-     * @param $branch
+     * @param Package $package
+     * @param string $branch
      *
      * @return void
      *

Spacing +40 added lines, -40 removed lines

@@ -57,7 +57,7 @@ 
         }
         foreach (['whitelistNames', 'whitelistPaths', 'whitelistRemotes'] as $key) {
             if (!array_key_exists($key, $config['composer'])) {
-                $config['composer'][ $key ] = null;
+                $config['composer'][$key] = null;
             }
         }
 
@@ -104,9 +104,9 @@ 
             $this->git('push', $package->path, array('u' => 'origin', $package->branch));
             $this->console->output(
                 str_repeat(chr(8), strlen($package->name))
-                . '<info>' . $package->name . '</info>'
+                . '<info>'.$package->name.'</info>'
             );
-            unset($this->pushPackages[ $i ]);
+            unset($this->pushPackages[$i]);
         }
     }
 
@@ -147,12 +147,12 @@ 
         $checkedOutPackages = array_keys($packages);
         $unfixedRequirements = 0;
         while ($packageName = array_shift($checkedOutPackages)) {
-            $branch = $packages[ $packageName ]->branch;
-            $version = 'dev-' . $branch;
+            $branch = $packages[$packageName]->branch;
+            $version = 'dev-'.$branch;
             foreach ($this->getPackages(false, false) as $package) {
                 if (array_key_exists($packageName, $package->requires)) {
                     // TODO: Set required version to branch alias, if any
-                    $requiredVersion = $package->requires[ $packageName ];
+                    $requiredVersion = $package->requires[$packageName];
                     if ($requiredVersion === '@dev') {
                         $requiredVersion = 'dev-master';
                     }
@@ -174,9 +174,9 @@ 
                                 $checkedOutPackages[] = $package->name;
                             }
                             if (!array_key_exists($package->name, $packages)) {
-                                $packages[ $package->name ] = $package;
+                                $packages[$package->name] = $package;
                             }
-                            $this->pushPackages[ $packageName ] = $packages[ $packageName ];
+                            $this->pushPackages[$packageName] = $packages[$packageName];
                             $this->rewriteRequirement($package, $packageName, $version);
                         } else {
                             $unfixedRequirements++;
@@ -206,8 +206,8 @@ 
     {
         $this->assertPackageIsWhiteListed($package);
 
-        $currentVersion = $package->requires[ $requiredPackage ];
-        $composerFile = $package->path . '/composer.json';
+        $currentVersion = $package->requires[$requiredPackage];
+        $composerFile = $package->path.'/composer.json';
         $composerFileContents = file_get_contents($composerFile);
         $newComposerFileContents = preg_replace(
             sprintf(
@@ -215,12 +215,12 @@ 
                 preg_quote($requiredPackage, '/'),
                 preg_quote($currentVersion, '/')
             ),
-            '$1' . $newVersion,
+            '$1'.$newVersion,
             $composerFileContents
         );
         file_put_contents($composerFile, $newComposerFileContents);
         $package->reloadRequires();
-        if ($package->requires[ $requiredPackage ] !== $newVersion) {
+        if ($package->requires[$requiredPackage] !== $newVersion) {
             file_put_contents($composerFile, $composerFileContents);
             $this->output('<error>Could not replace version</error> - generated composer.json was:');
             $this->output($newComposerFileContents);
@@ -235,7 +235,7 @@ 
 
         $this->console->output("Made <comment>$package->name</comment> require <comment>$requiredPackage $newVersion</comment>");
 
-        $this->pushPackages[ $package->name ] = $package;
+        $this->pushPackages[$package->name] = $package;
     }
 
     /**
@@ -275,7 +275,7 @@ 
         if (!$package->git) {
             throw new Exception('Non git package can not be checked out');
         }
-        $remoteBranch = 'origin/' . $branch;
+        $remoteBranch = 'origin/'.$branch;
         $isRemote = in_array($remoteBranch, $package->branches, true);
         if (in_array($branch, $package->branches, true)) {
             $this->git('checkout', $package->path, $branch);
@@ -284,7 +284,7 @@ 
         } elseif ($create) {
             $branches = array_unique(
                 array_map(
-                    function ($el) {
+                    function($el) {
                         $parts = explode('/', $el);
 
                         return array_pop($parts);
@@ -307,9 +307,9 @@ 
         }
 
         if ($isRemote) {
-            if (!isset($package->upstreams[ $branch ]) || $package->upstreams[ $branch ] !== $remoteBranch) {
+            if (!isset($package->upstreams[$branch]) || $package->upstreams[$branch] !== $remoteBranch) {
                 $this->git('branch', $package->path, array('u' => $remoteBranch));
-                $package->upstreams[ $branch ] = $remoteBranch;
+                $package->upstreams[$branch] = $remoteBranch;
             }
             $this->git('rebase', $package->path);
         }
@@ -317,7 +317,7 @@ 
         $this->console->output("Checked out <comment>{$package->name}</comment> at <comment>$branch</comment>");
 
         $package->reloadRequires();
-        $package->version = 'dev-' . $branch;
+        $package->version = 'dev-'.$branch;
         $package->branch = $branch;
 
         return true;
@@ -346,11 +346,11 @@ 
         }
 
         if (isset($conflictedFiles) || $this->git('status', $package->path, array('porcelain' => true))) {
-            $this->console->output('You are merging package <comment>' . $package->name . '</comment> from <comment>' . $branch . '</comment> into <comment>' . $package->branch . "</comment>.\n");
+            $this->console->output('You are merging package <comment>'.$package->name.'</comment> from <comment>'.$branch.'</comment> into <comment>'.$package->branch."</comment>.\n");
             if (!$message) {
                 $message = $this->answer(
                     'Enter commit message:',
-                    'Merged ' . $branch . ' into ' . $package->branch
+                    'Merged '.$branch.' into '.$package->branch
                 );
             }
             $this->git('commit', $package->path, array('n' => true, 'm' => $message));
@@ -359,7 +359,7 @@ 
         $this->console->output("Merged with <comment>$branch</comment> in <comment>{$package->name}</comment>");
 
         $package->reloadRequires();
-        $this->pushPackages[ $package->name ] = $package;
+        $this->pushPackages[$package->name] = $package;
     }
 
     /**
@@ -380,7 +380,7 @@ 
             throw new Exception('Non git package can not be merged');
         }
 
-        $this->git('fetch', $package->path, array('force' => true, 'origin', $branch . ':' . $branch));
+        $this->git('fetch', $package->path, array('force' => true, 'origin', $branch.':'.$branch));
     }
 
     /**
@@ -401,7 +401,7 @@ 
         } else {
             $mergeOptions['no-commit'] = true;
             $ff = $branch == 'master' ? 'ff' : 'no-ff';
-            $mergeOptions[ $ff ] = true;
+            $mergeOptions[$ff] = true;
         }
 
         $mergeOptions[] = $branch;
@@ -451,7 +451,7 @@ 
      */
     private function resolveRequirementsConflict($package)
     {
-        $contents = file_get_contents($package->path . '/composer.json');
+        $contents = file_get_contents($package->path.'/composer.json');
         $ours = @json_decode(
             preg_replace('/^<{7}.+\n(.+)\n(\|{7}|={7}).+>{7}.+$/smU', '$1', $contents)
         );
@@ -463,8 +463,8 @@ 
         }
         $diff = array_diff_key($theirs = get_object_vars($theirs), $ours = get_object_vars($ours));
         foreach ($ours as $key => $value) {
-            if ($key !== 'require' && (!array_key_exists($key, $theirs) || serialize($value) !== serialize($theirs[ $key ]))) {
-                $diff[ $key ] = $value;
+            if ($key !== 'require' && (!array_key_exists($key, $theirs) || serialize($value) !== serialize($theirs[$key]))) {
+                $diff[$key] = $value;
             }
         }
         if ($diff !== array()) {
@@ -472,7 +472,7 @@ 
         }
 
         $theirs['require'] = $this->mergeRequirements($package, $ours, $theirs);
-        file_put_contents($package->path . '/composer.json', $this->jsonEncode($theirs));
+        file_put_contents($package->path.'/composer.json', $this->jsonEncode($theirs));
     }
 
     /**
@@ -486,7 +486,7 @@ 
     {
         return json_encode(
             $var, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
-        ) . "\n";
+        )."\n";
     }
 
     /**
@@ -504,17 +504,17 @@ 
         $theirsRequire = isset($theirs['require']) && is_object($theirs['require']) ? get_object_vars($theirs['require']) : [];
         $mergedRequires = array_merge($oursRequire, $theirsRequire);
         $packages = $this->getPackages(false, false);
-        $preferredVersion = 'dev-' . $package->branch;
+        $preferredVersion = 'dev-'.$package->branch;
         foreach ($mergedRequires as $packageName => $version) {
             $actualVersion = ($version === '@dev') ? 'dev-master' : $version;
             if (array_key_exists($packageName, $oursRequire)
-                && $version !== $oursRequire[ $packageName ]
-                && $actualVersion !== $oursRequire[ $packageName ]
+                && $version !== $oursRequire[$packageName]
+                && $actualVersion !== $oursRequire[$packageName]
                 && $actualVersion !== $preferredVersion
                 && array_key_exists($packageName, $packages)
-                && in_array($package->branch, $packages[ $packageName ]->branches, true)
+                && in_array($package->branch, $packages[$packageName]->branches, true)
             ) {
-                $mergedRequires[ $packageName ] = $preferredVersion;
+                $mergedRequires[$packageName] = $preferredVersion;
             }
         }
 
@@ -536,7 +536,7 @@ 
         $packages = array();
         foreach ($this->get('composer.packages') as $package) {
             if ((!$gitOnly || $package->git) && (!$allowedOnly || $this->isPackageAllowed($package))) {
-                $packages[ $package->name ] = $package;
+                $packages[$package->name] = $package;
             }
         }
 
@@ -569,7 +569,7 @@ 
     protected function isPackageAllowed(Package $package)
     {
         if (!is_array($this->packageNames)) {
-            $this->packageNames = array_fill_keys($this->get('packages') ? : [], null);
+            $this->packageNames = array_fill_keys($this->get('packages') ?: [], null);
         }
 
         if ($this->packageNames) {
@@ -577,11 +577,11 @@ 
                 return false;
             }
             if ($this->isPackageWhiteListed($package) === false) {
-                if ($this->packageNames[ $package->name ] === null) {
-                    $this->packageNames[ $package->name ] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?");
+                if ($this->packageNames[$package->name] === null) {
+                    $this->packageNames[$package->name] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?");
                 }
 
-                return $this->packageNames[ $package->name ];
+                return $this->packageNames[$package->name];
             }
 
             return true;
@@ -602,9 +602,9 @@ 
         if (!is_array($this->whitelists)) {
             $this->whitelists = [];
             foreach (['path', 'remote', 'name'] as $whiteListType) {
-                $option = $this->get('whitelist' . ucfirst($whiteListType) . 's');
+                $option = $this->get('whitelist'.ucfirst($whiteListType).'s');
                 if ($option) {
-                    $this->whitelists[ $whiteListType ] = '#^' . $option . '$#';
+                    $this->whitelists[$whiteListType] = '#^'.$option.'$#';
                 }
             }
         }