netresearch / kite

src/Task/PharTask.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         $code = "<?php\n";
         foreach (array('to', 'from', 'filter', 'cliStub', 'webStub', 'alias', 'metadata') as $var) {
             $value = $this->get($var);
-            $code .= '$' . $var . " = unserialize('" . serialize($value) . "');\n";
+            $code .= '$'.$var." = unserialize('".serialize($value)."');\n";
         }
         $code .= '
         $phar = new \Phar($to);

src/Console/Command/LogCommand.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         if (!is_dir($dir)) {
             throw new Exception("Debug dir $dir doesn't exist");
         }
-        $files = glob($dir . '/*');
+        $files = glob($dir.'/*');
         if ($input->getOption('list')) {
             foreach ($files as $file) {
                 $output->writeln(basename($file));

presets/typo3.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         ],
         [
             'type' => 'shell',
-            'command' => '{config["php"]} ' . __DIR__ . '/typo3/clear-cache.php',
+            'command' => '{config["php"]} '.__DIR__.'/typo3/clear-cache.php',
             'processSettings' => ['pt' => true]
         ],
         [
@@ -53,7 +53,7 @@ 
             ['workflow' => 'clearCodeCaches'],
             [
                 'type' => 'scp',
-                'from' => __DIR__ . '/typo3',
+                'from' => __DIR__.'/typo3',
                 'to' => '{node}:{node.deployPath}/current/{config["workspace"]}/typo3'
             ],
             [

presets/typo3/schema-migration.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
  * @link     http://www.netresearch.de
  */
 
-require_once __DIR__ . '/bootstrap.php';
+require_once __DIR__.'/bootstrap.php';
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -41,7 +41,7 @@ 
         if ($execute) {
             $GLOBALS['TYPO3_DB']->admin_query($query);
             if ($GLOBALS['TYPO3_DB']->sql_error()) {
-                throw new \Exception('SQL-Error: ' . $GLOBALS['TYPO3_DB']->sql_error());
+                throw new \Exception('SQL-Error: '.$GLOBALS['TYPO3_DB']->sql_error());
             }
         }
     }

presets/typo3/clear-cache.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  * @link     http://www.netresearch.de
  */
 
-require __DIR__ . '/bootstrap.php';
+require __DIR__.'/bootstrap.php';
 
 $dataHandler = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\DataHandling\DataHandler');
 $dataHandler->stripslashes_values = 0;

presets/typo3/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     die('Access denied');
 }
 
-define('PATH_site', getcwd() . DIRECTORY_SEPARATOR);
+define('PATH_site', getcwd().DIRECTORY_SEPARATOR);
 
 $typo3VersionIsMinimum7 = true;
 
@@ -33,7 +33,7 @@ 
 }
 
 if ($typo3VersionIsMinimum7) {
-    $classLoader = include getcwd() . '/typo3_src/vendor/autoload.php';
+    $classLoader = include getcwd().'/typo3_src/vendor/autoload.php';
     \TYPO3\CMS\Core\Core\Bootstrap::getInstance()
         ->initializeClassLoader($classLoader)
         ->baseSetup(PATH_site)

src/ExpressionLanguage/ExpressionLanguage.php

Unused Use Statements -2 removed lines

@@ -14,8 +14,6 @@
 
 namespace Netresearch\Kite\ExpressionLanguage;
 use Netresearch\Kite\Task;
-
-use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
                     if ($requiredVersion !== $version) {
                         $this->assertPackageAllowed($package);
                         if (!$package->git) {
-                            throw new Exception("Package {$package->name} required to be installed from source");
+                            throw new Exception("package {$package->name} required to be installed from source");
                         }
                         if ($autoFix) {
                             $fix = true;
@@ -483,7 +483,7 @@ 
     protected function assertPackageAllowed($package)
     {
         if (!$this->isPackageAllowed($package)) {
-            throw new Exception("Package {$package->name} is not in white list");
+            throw new Exception("package {$package->name} is not in white list");
         }
     }