netresearch / kite

src/Service/Descriptor.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 namespace Netresearch\Kite\Task;
 
 
-use Netresearch\Kite\Exception;
 use Netresearch\Kite\Task;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -44,11 +44,11 @@
                 $taskProperty = new \ReflectionProperty('Netresearch\\Kite\\Tasks', 'tasks');
                 $taskProperty->setAccessible(true);
                 foreach ($taskProperty->getValue($task) as $subTask) {
-                    $description .= "\n\n" . $this->describeTask($subTask);
+                    $description .= "\n\n".$this->describeTask($subTask);
                 }
                 $description = trim($description);
                 if (!$description) {
-                    $description = 'Generic ' . $reflection->getName();
+                    $description = 'Generic '.$reflection->getName();
                 }
             } elseif (preg_match_all('/^ \* ([^@ \n].+|)$/mU', $reflection->getDocComment(), $matches, PREG_PATTERN_ORDER)) {
                 $description = trim(implode("\n", $matches[1]));

src/Task/ComposerTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
     /**
      * Execute the command
      *
-     * @return mixed
+     * @return null|string
      */
     protected function executeCommand()
     {

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     {
         if ($name === 'command') {
             parent::offsetSet('composerCommand', $value);
-            $value = 'composer ' .  $value;
+            $value = 'composer '.$value;
         }
         parent::offsetSet($name, $value);
     }
@@ -84,19 +84,19 @@ 
     protected function getCommand()
     {
         $cmd = $this->get('command');
-        $argv = substr(parent::getCommand(), strlen($cmd)) . ' ';
+        $argv = substr(parent::getCommand(), strlen($cmd)).' ';
         if (strpos($argv, ' --no-ansi ') === false
             && strpos($argv, ' --ansi ') === false
             && $this->console->getOutput()->isDecorated()
         ) {
-            $argv = ' --ansi' . $argv;
+            $argv = ' --ansi'.$argv;
         }
         if (!$this->shouldExecute()
             && strpos($argv, ' --dry-run ') === false
         ) {
-            $argv = ' --dry-run' . $argv;
+            $argv = ' --dry-run'.$argv;
         }
-        return $cmd . rtrim($argv);
+        return $cmd.rtrim($argv);
     }
 }
 ?>

src/Workflow/RenderReference.php

Spacing +19 added lines, -19 removed lines

@@ -60,7 +60,7 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $this->findLoaders();
                 $file = $this->get('file');
                 $this->console->getFilesystem()->ensureDirectoryExists(dirname($file));
@@ -109,7 +109,7 @@ 
 
         foreach (['task', 'workflow'] as $type) {
             $lines[] = '';
-            $lines[] = ucfirst($type) . 's';
+            $lines[] = ucfirst($type).'s';
             $lines[] = str_repeat('=', strlen($type) + 1);
             $lines[] = '';
             $taskObjects = $this->loadTaskObjects($type);
@@ -139,7 +139,7 @@ 
                     $lines[] = 'Options';
                     $lines[] = '```````';
                     $lines[] = '';
-                    $this->renderVariables($lines, $taskVariables, $type . '-' . $name);
+                    $this->renderVariables($lines, $taskVariables, $type.'-'.$name);
                 }
                 if ($taskCommonVariables) {
                     $lines[] = 'Common options';
@@ -175,7 +175,7 @@ 
         $keys = ['type', 'default', 'required', 'label'];
         $lines[] = '   * - Name';
         foreach ($keys as $key) {
-            $lines[] = '     - ' . ucfirst($key);
+            $lines[] = '     - '.ucfirst($key);
         }
 
         foreach ($variables as $configName => $config) {
@@ -184,11 +184,11 @@ 
             }
             $lines[] = '   * - ';
             $lines[] = '';
-            $lines[] = '       .. |' . $anchorPrefix . '-' . $configName . '| replace:: ' . $configName;
+            $lines[] = '       .. |'.$anchorPrefix.'-'.$configName.'| replace:: '.$configName;
             $lines[] = '';
-            $lines[] = '       .. _' . $anchorPrefix . '-' . $configName . ':';
+            $lines[] = '       .. _'.$anchorPrefix.'-'.$configName.':';
             $lines[] = '';
-            $lines[] = '       ' . $configName;
+            $lines[] = '       '.$configName;
             $lines[] = '';
             foreach ($keys as $key) {
                 if (!array_key_exists($key, $config)) {
@@ -197,7 +197,7 @@ 
                     $v = $config[$key];
                     $value = $v === null ? 'null' : ($v === true ? 'true' : ($v === false ? 'false' : $v));
                     if (is_string($value)) {
-                        $value = ':code:`' . $value . '`';
+                        $value = ':code:`'.$value.'`';
                     }
                 } elseif ($key === 'required') {
                     $value = $config[$key] === true ? 'X' : $config[$key];
@@ -205,12 +205,12 @@ 
                     $value = $config[$key];
                 }
                 if (is_array($value)) {
-                    $value = "\n\n       .. code::php\n\n           " . str_replace("\n", "\n\n           ", call_user_func('print' . '_r', $value, true)) . "\n\n";
+                    $value = "\n\n       .. code::php\n\n           ".str_replace("\n", "\n\n           ", call_user_func('print'.'_r', $value, true))."\n\n";
                 } else {
                     $value = str_replace("\n", "\n\n       ", $value);
                 }
-                $value = preg_replace('/\{@see\s+(' . implode('|', array_keys($variables)) . ')\}/', '|' . $anchorPrefix . '-$1|_', $value);
-                $lines[] = '     - ' . $value;
+                $value = preg_replace('/\{@see\s+('.implode('|', array_keys($variables)).')\}/', '|'.$anchorPrefix.'-$1|_', $value);
+                $lines[] = '     - '.$value;
             }
         }
         $lines[] = '';
@@ -225,8 +225,8 @@ 
     {
         static $commonVars;
         if (!is_array($commonVars)) {
-            $className = 'NetresearchKiteTask' . uniqid();
-            eval('class ' . $className . ' extends \\Netresearch\\Kite\\Task {}');
+            $className = 'NetresearchKiteTask'.uniqid();
+            eval('class '.$className.' extends \\Netresearch\\Kite\\Task {}');
             $instance = new $className($this);
             $commonVars = $instance->get('_variableConfiguration');
         }
@@ -243,7 +243,7 @@ 
     protected function loadTaskObjects($type)
     {
         $objects = [];
-        $requiredType = 'Netresearch\\Kite\\' . ucfirst($type);
+        $requiredType = 'Netresearch\\Kite\\'.ucfirst($type);
         foreach ($this->factory->getNamespaces($type) as $namespace) {
             $namespaceLength = strlen($namespace);
             if ($dir = $this->findDirectoryForNamespace($namespace)) {
@@ -251,7 +251,7 @@ 
                     if (substr($file, -4) !== '.php') {
                         continue;
                     }
-                    $class = $namespace . '\\' . substr(strtr($file, '/', '\\'), 0, -4);
+                    $class = $namespace.'\\'.substr(strtr($file, '/', '\\'), 0, -4);
                     $reflectionClass = new \ReflectionClass($class);
                     if (!$reflectionClass->isSubclassOf($requiredType) || !$reflectionClass->isInstantiable()) {
                         continue;
@@ -338,7 +338,7 @@ 
                     continue;
                 }
                 foreach ($dirs as $dir) {
-                    if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                    if (file_exists($file = $dir.DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $length))) {
                         return $file;
                     }
                 }
@@ -346,7 +346,7 @@ 
 
             // PSR-4 fallback dirs
             foreach ($loader->getFallbackDirsPsr4() as $dir) {
-                if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                     return $file;
                 }
             }
@@ -364,7 +364,7 @@ 
             foreach ($loader->getPrefixes() as $prefix => $dirs) {
                 if (0 === strpos($namespace, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -373,7 +373,7 @@ 
 
             // PSR-0 fallback dirs
             foreach ($loader->getFallbackDirs() as $dir) {
-                if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                     return $file;
                 }
             }

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 @@ 
         }
 
         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]))
         );
     }
@@ -433,7 +433,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)
@@ -499,9 +499,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.'$#';
                 }
             }
         }

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) $this->get('branch'),
                     $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;
         }

src/Workflow/ClearCodeCaches.php

Spacing +7 added lines, -7 removed lines

@@ -57,12 +57,12 @@ 
     public function assemble()
     {
         $this->callback(
-            function () {
+            function() {
                 $scriptPath = $this->createScript();
                 if ($webUrl = $this->get('webUrl')) {
                     $this->callScript($webUrl, $scriptPath);
                 } else {
-                    $this->scp($scriptPath, '{node}:{node.webRoot}/' . $scriptPath);
+                    $this->scp($scriptPath, '{node}:{node.webRoot}/'.$scriptPath);
                     foreach ($this->get('nodes') as $node) {
                         /* @var \Netresearch\Kite\Node $node */
                         if ($webUrl = $node->get('webUrl', null)) {
@@ -83,10 +83,10 @@ 
      */
     protected function createScript()
     {
-        $scriptPath = $this->get('baseDir') . '/ccc-' . uniqid() . '.php';
+        $scriptPath = $this->get('baseDir').'/ccc-'.uniqid().'.php';
         file_put_contents(
             $scriptPath,
-            '<?' . "php
+            '<?'."php
             if (function_exists('clearstatcache')) {
                 echo 'statcache|';
                 clearstatcache(true);
@@ -116,9 +116,9 @@ 
      */
     protected function callScript($baseUrl, $scriptPath)
     {
-        $url = rtrim($baseUrl, '/') . '/' . ltrim($scriptPath, '/');
+        $url = rtrim($baseUrl, '/').'/'.ltrim($scriptPath, '/');
 
-        $this->console->output('Calling ' . $url, OutputInterface::VERBOSITY_DEBUG);
+        $this->console->output('Calling '.$url, OutputInterface::VERBOSITY_DEBUG);
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_HEADER, 1);
@@ -134,7 +134,7 @@ 
             $this->console->outdent();
         } else {
             if ($caches) {
-                $this->console->output('Cleared code caches (' . implode(', ', $caches) . ')');
+                $this->console->output('Cleared code caches ('.implode(', ', $caches).')');
             } else {
                 $this->console->output('No code caches found');
             }

src/Service/Config.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     public function loadPreset($name)
     {
-        include dirname(dirname(__DIR__)) . '/presets/' . $name . '.php';
+        include dirname(dirname(__DIR__)).'/presets/'.$name.'.php';
     }
 
     /**

src/Service/Factory.php

Spacing +4 added lines, -4 removed lines

@@ -171,15 +171,15 @@
         $ucType = ucfirst($type);
         if (!strpos($definition, '\\')) {
             $taskClass = str_replace(' ', '\\', ucwords(str_replace('-', ' ', $definition)));
-            $taskClass = $taskClass . ($postfixType ? $ucType : '');
+            $taskClass = $taskClass.($postfixType ? $ucType : '');
             foreach ($this->namespaces[$type] as $namespace) {
-                $potentialClass = '\\' . $namespace . '\\' . $taskClass;
+                $potentialClass = '\\'.$namespace.'\\'.$taskClass;
                 if (class_exists($potentialClass)) {
                     return $potentialClass;
                 }
             }
-        } elseif (!is_subclass_of(ltrim($definition, '\\'), 'Netresearch\\Kite\\' . $ucType)) {
-            throw new Exception($definition .' must extend Netresearch\\Kite\\' . $ucType);
+        } elseif (!is_subclass_of(ltrim($definition, '\\'), 'Netresearch\\Kite\\'.$ucType)) {
+            throw new Exception($definition.' must extend Netresearch\\Kite\\'.$ucType);
         }
         return $definition;
     }

src/Service/Filesystem.php

Spacing +16 added lines, -16 removed lines

@@ -84,7 +84,7 @@ 
     {
         $dir = rtrim($dir, '/\\');
 
-        return count(glob($dir . '/*') ?: array()) === 0 && count(glob($dir . '/.*') ?: array()) === 2;
+        return count(glob($dir.'/*') ?: array()) === 0 && count(glob($dir.'/.*') ?: array()) === 2;
     }
 
     /**
@@ -104,7 +104,7 @@ 
         }
 
         if (preg_match('{^(?:[a-z]:)?[/\\\\]+$}i', $directory)) {
-            throw new \RuntimeException('Aborting an attempted deletion of ' . $directory . ', this was probably not intended, if it is a real use case please report it.');
+            throw new \RuntimeException('Aborting an attempted deletion of '.$directory.', this was probably not intended, if it is a real use case please report it.');
         }
 
         if (!function_exists('proc_open')) {
@@ -161,12 +161,12 @@ 
         if (!is_dir($directory)) {
             if (file_exists($directory)) {
                 throw new \RuntimeException(
-                    $directory . ' exists and is not a directory.'
+                    $directory.' exists and is not a directory.'
                 );
             }
             if (!@mkdir($directory, 0777, true)) {
                 throw new \RuntimeException(
-                    $directory . ' does not exist and could not be created.'
+                    $directory.' does not exist and could not be created.'
                 );
             }
         }
@@ -207,7 +207,7 @@ 
             $this->ensureDirectoryExists($target);
 
             foreach ($ri as $file) {
-                $targetPath = $target . DIRECTORY_SEPARATOR . $ri->getSubPathName();
+                $targetPath = $target.DIRECTORY_SEPARATOR.$ri->getSubPathName();
                 if ($file->isDir()) {
                     $this->ensureDirectoryExists($targetPath);
                 } else {
@@ -293,11 +293,11 @@ 
         }
 
         if (dirname($from) === dirname($to)) {
-            return './' . basename($to);
+            return './'.basename($to);
         }
 
         $commonPath = $to;
-        while (strpos($from . '/', $commonPath . '/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath)) {
+        while (strpos($from.'/', $commonPath.'/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath)) {
             $commonPath = strtr(dirname($commonPath), '\\', '/');
         }
 
@@ -305,11 +305,11 @@ 
             return $to;
         }
 
-        $commonPath = rtrim($commonPath, '/') . '/';
+        $commonPath = rtrim($commonPath, '/').'/';
         $sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/');
         $commonPathCode = str_repeat('../', $sourcePathDepth);
 
-        return ($commonPathCode . substr($to, strlen($commonPath))) ?: './';
+        return ($commonPathCode.substr($to, strlen($commonPath))) ?: './';
     }
 
     /**
@@ -337,7 +337,7 @@ 
         }
 
         $commonPath = $to;
-        while (strpos($from . '/', $commonPath . '/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath) && '.' !== $commonPath) {
+        while (strpos($from.'/', $commonPath.'/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath) && '.' !== $commonPath) {
             $commonPath = strtr(dirname($commonPath), '\\', '/');
         }
 
@@ -345,15 +345,15 @@ 
             return var_export($to, true);
         }
 
-        $commonPath = rtrim($commonPath, '/') . '/';
-        if (strpos($to, $from . '/') === 0) {
-            return '__DIR__ . ' . var_export(substr($to, strlen($from)), true);
+        $commonPath = rtrim($commonPath, '/').'/';
+        if (strpos($to, $from.'/') === 0) {
+            return '__DIR__ . '.var_export(substr($to, strlen($from)), true);
         }
         $sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/') + $directories;
-        $commonPathCode = str_repeat('dirname(', $sourcePathDepth) . '__DIR__' . str_repeat(')', $sourcePathDepth);
+        $commonPathCode = str_repeat('dirname(', $sourcePathDepth).'__DIR__'.str_repeat(')', $sourcePathDepth);
         $relTarget = substr($to, strlen($commonPath));
 
-        return $commonPathCode . (strlen($relTarget) ? '.' . var_export('/' . $relTarget, true) : '');
+        return $commonPathCode.(strlen($relTarget) ? '.'.var_export('/'.$relTarget, true) : '');
     }
 
     /**
@@ -426,7 +426,7 @@ 
             }
         }
 
-        return $prefix . ($absolute ? '/' : '') . implode('/', $parts);
+        return $prefix.($absolute ? '/' : '').implode('/', $parts);
     }
 
     /**