netresearch / kite

src/Workflow/Composer/Base.php

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.'$#';
                 }
             }
         }

src/Workflow/Composer/Diagnose.php

Spacing +22 added lines, -22 removed lines

@@ -58,7 +58,7 @@ 
             if (substr($method, 0, 5) === 'check' && $method[5] === strtoupper($method[5])) {
                 $check = substr($method, 5);
                 $this->checks[] = $check;
-                if (method_exists($this, 'fix' . $check)) {
+                if (method_exists($this, 'fix'.$check)) {
                     $this->fixes[] = $check;
                 }
             }
@@ -68,12 +68,12 @@ 
             'check' => array(
                 'type' => 'array',
                 'option' => true,
-                'label' => 'Only execute these checks - available checks are ' . implode(', ', $this->checks),
+                'label' => 'Only execute these checks - available checks are '.implode(', ', $this->checks),
             ),
             'fix' => array(
                 'type' => 'boolean|array',
                 'option' => true,
-                'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are ' . implode(', ', $this->fixes),
+                'label' => 'Enable fixes and optionally reduce to certain fixes - available fixes are '.implode(', ', $this->fixes),
             ),
         ) + parent::configureVariables();
     }
@@ -86,7 +86,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $fix = $this->get('fix');
                 $fixes = ($fix === true) ? $this->fixes : (array) $fix;
                 $checks = $this->get('check') ?: $this->checks;
@@ -120,11 +120,11 @@ 
             if ($packageNames && !in_array($package->name, $packageNames, true)) {
                 continue;
             }
-            if (is_string($message = $this->{'check' . $check}($package))) {
+            if (is_string($message = $this->{'check'.$check}($package))) {
                 if (!$packageNames && !$errors) {
                     $this->console->output(
                         str_repeat(chr(8), strlen($check))
-                        . '<fg=red;bg=black>' . $check . '</>'
+                        . '<fg=red;bg=black>'.$check.'</>'
                     );
                 }
                 $message = sprintf($message, "package <comment>$package->name</>");
@@ -133,7 +133,7 @@ 
                 if ($fix) {
                     $this->dontCheckCurrentPackageAgain = false;
                     $this->console->indent();
-                    $this->{'fix' . $check}($package);
+                    $this->{'fix'.$check}($package);
                     $this->console->outdent();
                     if (!$this->dontCheckCurrentPackageAgain) {
                         $rerunForPackages[] = $package->name;
@@ -155,7 +155,7 @@ 
             if (!$errors) {
                 $this->console->output(
                     str_repeat(chr(8), strlen($check))
-                    . '<fg=green;bg=black>' . $check . '</>'
+                    . '<fg=green;bg=black>'.$check.'</>'
                 );
             }
             $this->console->outdent();
@@ -212,7 +212,7 @@ 
             $this->git('reset', $package->path);
             $args = 'save -u';
             if ($message = $this->answer('Message for stash:')) {
-                $args .= ' ' . escapeshellarg($message);
+                $args .= ' '.escapeshellarg($message);
             }
             $this->git('stash', $package->path, $args);
             break;
@@ -283,7 +283,7 @@ 
         case 2:
             foreach ($commands as $command) {
                 $pck = "<comment>{$package->name}</comment>";
-                $this->console->output($msg = ucfirst($command) . "ing $pck...", false);
+                $this->console->output($msg = ucfirst($command)."ing $pck...", false);
                 $this->git($command, $package->path, isset($options) ? $options : null);
                 $this->console->output(
                     str_repeat(chr(8), strlen(strip_tags($msg)))
@@ -330,8 +330,8 @@ 
                         }
                         if ($package->requiredBranch && $package->requiredBranch !== $requiredBranch) {
                             $package->invalidRequirements = true;
-                            return '<error>' . array_pop($dependentPackages)
-                                . ' and ' . array_pop($dependentPackages)
+                            return '<error>'.array_pop($dependentPackages)
+                                . ' and '.array_pop($dependentPackages)
                                 . ' require %s in different branches</error>';
                         }
                         $package->requiredBranch = $requiredBranch;
@@ -343,7 +343,7 @@ 
                     }
                 }
             }
-            $constraint = $package->tag ?: 'dev-' . $package->branch;
+            $constraint = $package->tag ?: 'dev-'.$package->branch;
             if ($package->requiredBranch && $package->requiredBranch !== $package->branch) {
                 return "%s is at <comment>$constraint</comment> but is required at <comment>dev-{$package->requiredBranch}</comment>";
             }
@@ -367,8 +367,8 @@ 
         if ($package->invalidRequirements) {
             $this->doExit('Can not fix that', 1);
         }
-        $currentConstraint = $package->tag ?: 'dev-' . $package->branch;
-        $requiredConstraint = 'dev-' . $package->requiredBranch;
+        $currentConstraint = $package->tag ?: 'dev-'.$package->branch;
+        $requiredConstraint = 'dev-'.$package->requiredBranch;
         if ($package->requiredBranch) {
             $actions = array(
                 1 => "Show divergent commits between <comment>$currentConstraint</comment> and <comment>$requiredConstraint</comment> (and ask again)",
@@ -421,7 +421,7 @@ 
         if ($package->git && !$package->isRoot) {
             $remote = false;
             do {
-                $reference = ($remote ? 'origin/' : '') . $package->source->reference;
+                $reference = ($remote ? 'origin/' : '').$package->source->reference;
                 try {
                     $rawCounts = $this->git('rev-list', $package->path, "--count --left-right --cherry-pick {$reference}...");
                     break;
@@ -436,9 +436,9 @@ 
             if ($counts[0] || $counts[1]) {
                 $num = $counts[0] ?: $counts[1];
                 $type = $counts[0] ? 'behind</>' : 'ahead</> of';
-                return '%s is <comment>' . $num . ' commit' . ($num > 1 ? 's ' : ' ')
-                    . $type . ' locked commit <comment>'
-                    . substr($package->source->reference, 0, 7) . '</>';
+                return '%s is <comment>'.$num.' commit'.($num > 1 ? 's ' : ' ')
+                    . $type.' locked commit <comment>'
+                    . substr($package->source->reference, 0, 7).'</>';
             }
         }
         return null;
@@ -490,7 +490,7 @@ 
         if ($package->isRoot) {
             try {
                 $this->composer('validate', '--no-check-all --no-check-publish');
-            } catch(Exception\ProcessFailedException $e) {
+            } catch (Exception\ProcessFailedException $e) {
                 return 'The lock file is not up to date with the latest changes in root composer.json';
             }
         }
@@ -558,12 +558,12 @@ 
             $side = $i ? 'left' : 'right';
             $otherSide = $i ? 'right' : 'left';
             $args = "--$side-only --cherry-pick --pretty=format:'%C(yellow)%h %Cgreen%cd %an%Creset%n  %s' --abbrev-commit --date=local ";
-            $args .= $ref . '...';
+            $args .= $ref.'...';
             $log = $this->git('log', $package->path, $args, array('shy' => true));
             if ($log) {
                 $this->console->output('');
 
-                $title = "<info>{${$side . 'Title'}}</info> > <info>{${$otherSide . 'Title'}}</info>";
+                $title = "<info>{${$side.'Title'}}</info> > <info>{${$otherSide.'Title'}}</info>";
                 $this->output($title);
                 $this->console->output(str_repeat('-', strlen(strip_tags($title))));
 

src/Workflow/Composer/Checkout.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $this->checkoutPackages(
                     array_unique(array_merge((array) $this->get('branch'), ['master'])),
                     $this->get('merge'),
@@ -109,9 +109,9 @@ 
             $lastBranch = array_pop($branches);
             $message = 'Could not find branch ';
             if ($branches) {
-                $message .= implode(', ', $branches) . ' or ';
+                $message .= implode(', ', $branches).' or ';
             }
-            $message .= $lastBranch . ' in any installed package';
+            $message .= $lastBranch.' in any installed package';
             $this->console->output("<warning>$message</warning>");
             return;
         }