netresearch / kite

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/Service/Composer/Package.php

Spacing +6 added lines, -6 removed lines

@@ -71,12 +71,12 @@ 
         if (is_string($composerJson)) {
             $path = realpath($composerJson);
             if (!$path) {
-                throw new Exception('Could not find ' . $composerJson);
+                throw new Exception('Could not find '.$composerJson);
             }
             $this->path = dirname($path);
             $composerJson = json_decode(file_get_contents($path));
             if (!is_object($composerJson)) {
-                throw new Exception('Could not load ' . $path);
+                throw new Exception('Could not load '.$path);
             }
         }
         foreach (get_object_vars($composerJson) as $key => $value) {
@@ -97,7 +97,7 @@ 
     {
         switch ($name) {
         case 'git':
-            $gitDir = $this->path . '/.git';
+            $gitDir = $this->path.'/.git';
             $this->git = file_exists($gitDir) && is_dir($gitDir);
             break;
         case 'branches':
@@ -113,7 +113,7 @@ 
             $this->loadRequires();
             break;
         default:
-            throw new Exception('Invalid property ' . $name);
+            throw new Exception('Invalid property '.$name);
 
         }
         return $this->$name;
@@ -157,7 +157,7 @@ 
      */
     public function reloadRequires()
     {
-        $file = $this->path . '/composer.json';
+        $file = $this->path.'/composer.json';
         if (file_exists($file)) {
             $composerJson = json_decode(file_get_contents($file));
             unset($this->require);
@@ -212,7 +212,7 @@ 
         if ($this->git) {
             $this->composer->git('fetch', $this->path, array('p' => true, 'origin'));
             try {
-                $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '') . '|%(refname:short)|%(upstream:short)';
+                $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '').'|%(refname:short)|%(upstream:short)';
                 $gitBr = $this->composer->git('for-each-ref', $this->path, ['format' => $format, 'refs/heads/', 'refs/remotes/origin']);
             } catch (Exception\ProcessFailedException $e) {
                 if (trim($e->getProcess()->getErrorOutput()) === 'fatal: unknown field name: HEAD') {

src/Workflow/Composer/Base.php

Spacing +15 added lines, -15 removed lines

@@ -103,7 +103,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]);
         }
@@ -147,7 +147,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
@@ -205,7 +205,7 @@ 
         $this->assertPackageIsWhiteListed($package);
 
         $currentVersion = $package->requires[$requiredPackage];
-        $composerFile = $package->path . '/composer.json';
+        $composerFile = $package->path.'/composer.json';
         $composerFileContents = file_get_contents($composerFile);
         $newComposerFileContents = preg_replace(
             sprintf(
@@ -213,7 +213,7 @@ 
                 preg_quote($requiredPackage, '/'),
                 preg_quote($currentVersion, '/')
             ),
-            '$1' . $newVersion,
+            '$1'.$newVersion,
             $composerFileContents
         );
         file_put_contents($composerFile, $newComposerFileContents);
@@ -272,7 +272,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);
@@ -281,7 +281,7 @@ 
         } elseif ($create) {
             $branches = array_unique(
                 array_map(
-                    function ($el) {
+                    function($el) {
                         $parts = explode('/', $el);
                         return array_pop($parts);
                     },
@@ -313,7 +313,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;
@@ -337,7 +337,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);
@@ -371,7 +371,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));
@@ -392,7 +392,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)
         );
@@ -413,7 +413,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));
     }
 
     /**
@@ -427,7 +427,7 @@ 
     {
         return json_encode(
             $var, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
-        ) . "\n";
+        )."\n";
     }
 
     /**
@@ -445,7 +445,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)
@@ -537,9 +537,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.'$#';
                 }
             }
         }