netresearch / kite

src/Console/Application.php

Spacing +18 added lines, -18 removed lines

@@ -81,7 +81,7 @@ 
             list($dir, $file) = $dirAndFile;
             if (is_dir($dir)) {
                 $app = $appName;
-                $expectedFile = $dir . '/' . $file;
+                $expectedFile = $dir.'/'.$file;
                 break;
             }
         }
@@ -91,9 +91,9 @@ 
         } catch (\Exception $e) {
             if ($app) {
                 $message = [
-                    'You appear to be in a ' . $app . ' root directory but',
+                    'You appear to be in a '.$app.' root directory but',
                     'there is no kite config file at the expected',
-                    'location (' . $expectedFile . ').'
+                    'location ('.$expectedFile.').'
                 ];
             } else {
                 $message = [
@@ -103,9 +103,9 @@ 
                     'The config file path is expected to be:',
                 ];
                 foreach ($indicators as $appName => $dirAndFile) {
-                    $message[] = '  - "' . implode('/', $dirAndFile) . '" for ' . $appName . ' applications or';
+                    $message[] = '  - "'.implode('/', $dirAndFile).'" for '.$appName.' applications or';
                 }
-                $message[] = '  - "' . $expectedFile . '" for any other application';
+                $message[] = '  - "'.$expectedFile.'" for any other application';
             }
             $lMax = 0;
             foreach ($message as $line) {
@@ -113,12 +113,12 @@ 
                     $lMax = $l;
                 }
             }
-            $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>');
+            $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>');
             foreach ($message as $line) {
                 $line = str_pad($line, $lMax + 2);
                 $this->output->writeln("<warning>  $line</warning>");
             }
-            $this->output->writeln('<warning>' . str_repeat(' ', $lMax + 4) . '</warning>');
+            $this->output->writeln('<warning>'.str_repeat(' ', $lMax + 4).'</warning>');
         }
     }
 
@@ -135,7 +135,7 @@ 
             . "| ' /| | __/ _ \\\n"
             . "| . \\| | |_| __/\n"
             . "|_|\\_|_|\\__\\___|\n\n"
-            . $this->getLongVersion() . "\n\n"
+            . $this->getLongVersion()."\n\n"
             . $this->getSelfPackage()->description;
 
         return $help;
@@ -153,7 +153,7 @@ 
         if (isset($package->source)) {
             $v .= " <comment>({$package->source->reference})</comment>";
         }
-        $v .= ' ' . $package->time;
+        $v .= ' '.$package->time;
         return $v;
     }
 
@@ -166,7 +166,7 @@ 
     {
         static $package = null;
         if (!$package) {
-            $files = [__DIR__ . '/../../../../composer/installed.json', __DIR__ . '/vendor/composer/installed.json'];
+            $files = [__DIR__.'/../../../../composer/installed.json', __DIR__.'/vendor/composer/installed.json'];
             foreach ($files as $file) {
                 if (file_exists($file)) {
                     $installed = json_decode(file_get_contents($file));
@@ -183,9 +183,9 @@ 
                 $process = new Process('git symbolic-ref -q --short HEAD || git describe --tags --exact-match; git rev-parse HEAD; git show -s --format=%ct HEAD', $kitePath);
                 $process->run();
                 if ($output = $process->getOutput()) {
-                    $package = json_decode(file_get_contents($kitePath . '/composer.json'));
+                    $package = json_decode(file_get_contents($kitePath.'/composer.json'));
                     list($name, $revision, $tstamp) = explode("\n", trim($output), 3);
-                    $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-' . $name;
+                    $package->version = preg_match('/^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?$/i', $name) ? $name : 'dev-'.$name;
                     $package->source = (object) ['reference' => $revision];
                     $package->time = date('Y-m-d H:i:s', $tstamp);
                 } else {
@@ -207,7 +207,7 @@ 
         $definition->addOption(new InputOption('workflow', null, InputOption::VALUE_OPTIONAL, 'Run a workflow on the fly'));
 
         if (isset($_SERVER['HOME']) && is_writable($_SERVER['HOME'])) {
-            $debugDir = $_SERVER['HOME'] . '/.kite/log';
+            $debugDir = $_SERVER['HOME'].'/.kite/log';
         } else {
             $debugDir = false;
         }
@@ -251,19 +251,19 @@ 
                 $strInput .= ' --help';
             }
             $workflow = $input->getParameterOption('--workflow');
-            $jobName = 'generic:workflow:' . $workflow;
+            $jobName = 'generic:workflow:'.$workflow;
             $this->config->configureJob($jobName, array('workflow' => $workflow));
             $command = new JobCommand($jobName, $this->config);
             $this->add($command);
 
-            $parameterOption = '--workflow=' . $workflow;
+            $parameterOption = '--workflow='.$workflow;
             $input = new StringInput(
                 rtrim(
-                    $jobName . ' ' .
+                    $jobName.' '.
                     str_replace(
                         array(
-                            $parameterOption . ' ',
-                            ' ' . $parameterOption,
+                            $parameterOption.' ',
+                            ' '.$parameterOption,
                             $parameterOption
                         ), '', $strInput
                     )

src/ExpressionLanguage/ExpressionLanguage.php

Spacing +10 added lines, -10 removed lines

@@ -122,7 +122,7 @@ 
     {
         parent::registerFunctions();
         $functions = [
-            'call' => function (array $values, $function) {
+            'call' => function(array $values, $function) {
                 $args = array_slice(func_get_args(), 2);
                 if (array_key_exists($function, $this->functions)) {
                     array_unshift($args, $values);
@@ -130,29 +130,29 @@ 
                 }
                 return call_user_func_array($function, $args);
             },
-            'isset' => function (array $values, $var) {
+            'isset' => function(array $values, $var) {
                 return $values[self::VARIABLES_KEY]->has($var);
             },
-            'empty' => function (array $values, $var) {
+            'empty' => function(array $values, $var) {
                 return !$values[self::VARIABLES_KEY]->has($var) || !$values[self::VARIABLES_KEY]->get($var);
             },
-            'get' => function (array $values, $var) {
+            'get' => function(array $values, $var) {
                 return $values[self::VARIABLES_KEY]->get($var);
             },
-            'set' => function (array $values, $var, $value) {
+            'set' => function(array $values, $var, $value) {
                 $values[self::VARIABLES_KEY]->set($var, $value);
                 return $value;
             },
-            'confirm' => function (array $values, $question) {
+            'confirm' => function(array $values, $question) {
                 return $this->ask($values[self::VARIABLES_KEY], new ConfirmationQuestion("<question>$question</question> [y] "));
             },
-            'answer' => function (array $values, $question) {
+            'answer' => function(array $values, $question) {
                 return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> "));
             },
-            'choose' => function (array $values, $question) {
+            'choose' => function(array $values, $question) {
                 return $this->ask($values[self::VARIABLES_KEY], new Question("<question>$question</question> "));
             },
-            'replace' => function (array $values, $search, $replace, $subject, $regex = false) {
+            'replace' => function(array $values, $search, $replace, $subject, $regex = false) {
                 $values[self::VARIABLES_KEY]->console->output(
                     '<warning>Expression language function "replace" is deprecated '
                     . 'and will be removed in 1.6.0 - use preg_replace or str_replace</warning>'
@@ -167,7 +167,7 @@ 
         foreach ($functions as $name => $function) {
             $this->register(
                 $name,
-                function () {
+                function() {
 
                 },
                 $function

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