netresearch / kite

src/Workflow/Composer/Base.php

Spacing +20 added lines, -20 removed lines

@@ -92,7 +92,7 @@ 
             $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]);
         }
@@ -136,7 +136,7 @@ 
         $unfixedRequirements = 0;
         while ($packageName = array_shift($checkedOutPackages)) {
             $branch = $packages[$packageName]->branch;
-            $version = 'dev-' . $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
@@ -194,7 +194,7 @@ 
         $this->assertPackageAllowed($package);
 
         $currentVersion = $package->requires[$requiredPackage];
-        $composerFile = $package->path . '/composer.json';
+        $composerFile = $package->path.'/composer.json';
         $composerFileContents = file_get_contents($composerFile);
         $newComposerFileContents = preg_replace(
             sprintf(
@@ -202,7 +202,7 @@ 
                 preg_quote($requiredPackage, '/'),
                 preg_quote($currentVersion, '/')
             ),
-            '$1' . $newVersion,
+            '$1'.$newVersion,
             $composerFileContents
         );
         file_put_contents($composerFile, $newComposerFileContents);
@@ -237,7 +237,7 @@ 
      */
     protected function reloadRequires($package)
     {
-        $file = $package->path . '/composer.json';
+        $file = $package->path.'/composer.json';
         if (file_exists($file)) {
             $composerJson = json_decode(file_get_contents($file));
             $package->requires = isset($composerJson->require) ? get_object_vars($composerJson->require) : array();
@@ -263,7 +263,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);
@@ -272,7 +272,7 @@ 
         } elseif ($create) {
             $branches = array_unique(
                 array_map(
-                    function ($el) {
+                    function($el) {
                         $parts = explode('/', $el);
                         return array_pop($parts);
                     },
@@ -304,7 +304,7 @@ 
         $this->console->output("Checked out <comment>{$package->name}</comment> at <comment>$branch</comment>");
 
         $this->reloadRequires($package);
-        $package->version = 'dev-' . $branch;
+        $package->version = 'dev-'.$branch;
         $package->branch = $branch;
 
         return true;
@@ -328,7 +328,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));
 
         $ff = $branch == 'master' ? 'ff' : 'no-ff';
         $optArg = array($ff => true, 'no-commit' => true);
@@ -362,7 +362,7 @@ 
             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));
@@ -383,7 +383,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)
         );
@@ -404,16 +404,16 @@ 
         }
 
         if (preg_match('/\{[^\{]*<{7}.+?>{7}[^\{]*([\t ]*)\}/smU', $contents, $matches, PREG_OFFSET_CAPTURE)) {
-            $prefix = "\n" . str_repeat($matches[1][0], 2);
+            $prefix = "\n".str_repeat($matches[1][0], 2);
             $requireBlock = '';
             foreach ($this->mergeRequirements($package, $ours, $theirs) as $packageName => $version) {
-                $requireBlock .= $prefix . '"' . $packageName . '": "' . $version . '",';
+                $requireBlock .= $prefix.'"'.$packageName.'": "'.$version.'",';
             }
             file_put_contents(
-                $package->path . '/composer.json',
-                substr($contents, 0, $matches[0][1]) . '{'
-                . rtrim($requireBlock, ',') . "\n"
-                . $matches[1][0] . '}'
+                $package->path.'/composer.json',
+                substr($contents, 0, $matches[0][1]).'{'
+                . rtrim($requireBlock, ',')."\n"
+                . $matches[1][0].'}'
                 . substr($contents, $matches[0][1] + strlen($matches[0][0]))
             );
         }
@@ -434,7 +434,7 @@ 
         $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)
@@ -500,9 +500,9 @@ 
         if (!is_array($this->whitelists)) {
             $this->whitelists = [];
             foreach ($whitelistTypes 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.'$#';
                 }
             }
         }