@@ -2,7 +2,7 @@ |
||
| 2 | 2 | $I = new CliGuy($scenario); |
| 3 | 3 | |
| 4 | 4 | $I->wantTo('copy dir recursively with CopyDir task, but exclude a file'); |
| 5 | -$I->amInPath(codecept_data_dir().'sandbox'); |
|
| 5 | +$I->amInPath(codecept_data_dir() . 'sandbox'); |
|
| 6 | 6 | $I->seeDirFound('some/deeply/nested'); |
| 7 | 7 | $I->seeDirFound('some/deeply/nested2'); |
| 8 | 8 | $I->seeDirFound('some/deeply/nested3'); |
@@ -235,7 +235,7 @@ |
||
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | $this->version = array_intersect_key($matches, $this->version); |
| 238 | - $this->version = array_map(function ($item) { |
|
| 238 | + $this->version = array_map(function($item) { |
|
| 239 | 239 | return $item[0]; |
| 240 | 240 | }, $this->version); |
| 241 | 241 | } |
@@ -73,9 +73,9 @@ |
||
| 73 | 73 | */ |
| 74 | 74 | private static function getClassKey($key) |
| 75 | 75 | { |
| 76 | - $configPrefix = static::configPrefix(); // task. |
|
| 77 | - $configClass = static::configClassIdentifier(get_called_class()); // PARTIAL_NAMESPACE.CLASSNAME |
|
| 78 | - $configPostFix = static::configPostfix(); // .settings |
|
| 76 | + $configPrefix = static::configPrefix(); // task. |
|
| 77 | + $configClass = static::configClassIdentifier(get_called_class()); // PARTIAL_NAMESPACE.CLASSNAME |
|
| 78 | + $configPostFix = static::configPostfix(); // .settings |
|
| 79 | 79 | |
| 80 | 80 | return sprintf('%s%s%s.%s', $configPrefix, $configClass, $configPostFix, $key); |
| 81 | 81 | } |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | use Robo\Robo; |
| 3 | - |
|
| 4 | 3 | use Consolidation\Config\Loader\ConfigProcessor; |
| 5 | 4 | use Consolidation\Config\Loader\YamlConfigLoader; |
| 6 | 5 | |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | * the input string contains no '=' character, then the value will be 'true'. |
| 84 | 84 | * |
| 85 | 85 | * @param string $value |
| 86 | - * @return array |
|
| 86 | + * @return boolean[] |
|
| 87 | 87 | */ |
| 88 | 88 | protected function splitConfigKeyValue($value) |
| 89 | 89 | { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | 'http' => [ |
| 56 | 56 | 'method' => 'GET', |
| 57 | 57 | 'header' => [ |
| 58 | - 'User-Agent: ' . $this->applicationName . ' (' . $this->gitHubRepository . ')' . ' Self-Update (PHP)' |
|
| 58 | + 'User-Agent: ' . $this->applicationName . ' (' . $this->gitHubRepository . ')' . ' Self-Update (PHP)' |
|
| 59 | 59 | ] |
| 60 | 60 | ] |
| 61 | 61 | ]; |
@@ -65,14 +65,14 @@ discard block |
||
| 65 | 65 | $releases = file_get_contents('https://api.github.com/repos/' . $this->gitHubRepository . '/releases', false, $context); |
| 66 | 66 | $releases = json_decode($releases); |
| 67 | 67 | |
| 68 | - if (! isset($releases[0])) { |
|
| 68 | + if (!isset($releases[0])) { |
|
| 69 | 69 | throw new \Exception('API error - no release found at GitHub repository ' . $this->gitHubRepository); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | $version = $releases[0]->tag_name; |
| 73 | 73 | $url = $releases[0]->assets[0]->browser_download_url; |
| 74 | 74 | |
| 75 | - return [ $version, $url ]; |
|
| 75 | + return [$version, $url]; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -89,20 +89,20 @@ discard block |
||
| 89 | 89 | $tempFilename = dirname($localFilename) . '/' . basename($localFilename, '.phar') . '-temp.phar'; |
| 90 | 90 | |
| 91 | 91 | // check for permissions in local filesystem before start connection process |
| 92 | - if (! is_writable($tempDirectory = dirname($tempFilename))) { |
|
| 92 | + if (!is_writable($tempDirectory = dirname($tempFilename))) { |
|
| 93 | 93 | throw new \Exception( |
| 94 | 94 | $programName . ' update failed: the "' . $tempDirectory . |
| 95 | 95 | '" directory used to download the temp file could not be written' |
| 96 | 96 | ); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - if (! is_writable($localFilename)) { |
|
| 99 | + if (!is_writable($localFilename)) { |
|
| 100 | 100 | throw new \Exception( |
| 101 | 101 | $programName . ' update failed: the "' . $localFilename . '" file could not be written (execute with sudo)' |
| 102 | 102 | ); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - list( $latest, $downloadUrl ) = $this->getLatestReleaseFromGithub(); |
|
| 105 | + list($latest, $downloadUrl) = $this->getLatestReleaseFromGithub(); |
|
| 106 | 106 | |
| 107 | 107 | |
| 108 | 108 | if ($this->currentVersion == $latest) { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $this->_exit(); |
| 132 | 132 | } catch (\Exception $e) { |
| 133 | 133 | @unlink($tempFilename); |
| 134 | - if (! $e instanceof \UnexpectedValueException && ! $e instanceof \PharException) { |
|
| 134 | + if (!$e instanceof \UnexpectedValueException && !$e instanceof \PharException) { |
|
| 135 | 135 | throw $e; |
| 136 | 136 | } |
| 137 | 137 | $output->writeln('<error>The download is corrupted (' . $e->getMessage() . ').</error>'); |
@@ -22,6 +22,11 @@ |
||
| 22 | 22 | |
| 23 | 23 | protected $applicationName; |
| 24 | 24 | |
| 25 | + /** |
|
| 26 | + * @param string $applicationName |
|
| 27 | + * @param string $currentVersion |
|
| 28 | + * @param string $gitHubRepository |
|
| 29 | + */ |
|
| 25 | 30 | public function __construct($applicationName = null, $currentVersion = null, $gitHubRepository = null) |
| 26 | 31 | { |
| 27 | 32 | $this->applicationName = $applicationName; |
@@ -7,8 +7,6 @@ |
||
| 7 | 7 | |
| 8 | 8 | namespace Robo\Common; |
| 9 | 9 | |
| 10 | -use Symfony\Component\Process\Exception\InvalidArgumentException; |
|
| 11 | - |
|
| 12 | 10 | /** |
| 13 | 11 | * ProcessUtils is a bunch of utility methods. We want to allow Robo 1.x |
| 14 | 12 | * to work with Symfony 4.x while remaining backwards compatibility. This |
@@ -72,6 +72,9 @@ |
||
| 72 | 72 | return "'".str_replace("'", "'\\''", $argument)."'"; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | + /** |
|
| 76 | + * @param string $char |
|
| 77 | + */ |
|
| 75 | 78 | private static function isSurroundedBy($arg, $char) |
| 76 | 79 | { |
| 77 | 80 | return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1]; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public static function escapeArgument($argument) |
| 36 | 36 | { |
| 37 | - @trigger_error('The '.__METHOD__.'() method is a copy of a method that was deprecated by Symfony 3.3 and removed in Symfony 4; it will be removed in Robo 2.0.', E_USER_DEPRECATED); |
|
| 37 | + @trigger_error('The ' . __METHOD__ . '() method is a copy of a method that was deprecated by Symfony 3.3 and removed in Symfony 4; it will be removed in Robo 2.0.', E_USER_DEPRECATED); |
|
| 38 | 38 | |
| 39 | 39 | //Fix for PHP bug #43784 escapeshellarg removes % from given string |
| 40 | 40 | //Fix for PHP bug #49446 escapeshellarg doesn't work on Windows |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $escapedArgument .= '\\"'; |
| 53 | 53 | } elseif (self::isSurroundedBy($part, '%')) { |
| 54 | 54 | // Avoid environment variable expansion |
| 55 | - $escapedArgument .= '^%"'.substr($part, 1, -1).'"^%'; |
|
| 55 | + $escapedArgument .= '^%"' . substr($part, 1, -1) . '"^%'; |
|
| 56 | 56 | } else { |
| 57 | 57 | // escape trailing backslash |
| 58 | 58 | if ('\\' === substr($part, -1)) { |
@@ -63,13 +63,13 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | if ($quote) { |
| 66 | - $escapedArgument = '"'.$escapedArgument.'"'; |
|
| 66 | + $escapedArgument = '"' . $escapedArgument . '"'; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | return $escapedArgument; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - return "'".str_replace("'", "'\\''", $argument)."'"; |
|
| 72 | + return "'" . str_replace("'", "'\\''", $argument) . "'"; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | private static function isSurroundedBy($arg, $char) |
@@ -41,8 +41,8 @@ discard block |
||
| 41 | 41 | $I->wantTo('set iterable in the __constructor'); |
| 42 | 42 | $I |
| 43 | 43 | ->taskForEach($example['items']) |
| 44 | - ->withBuilder(function (CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 45 | - $builder->addCode(function () use ($key, $value, &$actual) { |
|
| 44 | + ->withBuilder(function(CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 45 | + $builder->addCode(function() use ($key, $value, &$actual) { |
|
| 46 | 46 | $actual[] = "$key = $value"; |
| 47 | 47 | |
| 48 | 48 | return 0; |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $I->wantTo('set iterable with deferTaskConfiguration()'); |
| 64 | 64 | $I |
| 65 | 65 | ->collectionBuilder() |
| 66 | - ->addCode(function (Data $data) use ($example) { |
|
| 66 | + ->addCode(function(Data $data) use ($example) { |
|
| 67 | 67 | $data['items'] = $example['items']; |
| 68 | 68 | |
| 69 | 69 | return 0; |
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | $I |
| 73 | 73 | ->taskForEach() |
| 74 | 74 | ->deferTaskConfiguration('setIterable', 'items') |
| 75 | - ->withBuilder(function (CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 76 | - $builder->addCode(function () use ($key, $value, &$actual) { |
|
| 75 | + ->withBuilder(function(CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 76 | + $builder->addCode(function() use ($key, $value, &$actual) { |
|
| 77 | 77 | $actual[] = "$key = $value"; |
| 78 | 78 | |
| 79 | 79 | return 0; |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | $I->wantTo('call the __constructor() without argument'); |
| 92 | 92 | $I |
| 93 | 93 | ->taskForEach() |
| 94 | - ->withBuilder(function (CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 95 | - $builder->addCode(function () use ($key, $value, &$actual) { |
|
| 94 | + ->withBuilder(function(CollectionBuilder $builder, $key, $value) use (&$actual) { |
|
| 95 | + $builder->addCode(function() use ($key, $value, &$actual) { |
|
| 96 | 96 | $actual++; |
| 97 | 97 | |
| 98 | 98 | return 0; |
@@ -91,8 +91,8 @@ |
||
| 91 | 91 | { |
| 92 | 92 | $finder = new Finder(); |
| 93 | 93 | $finder->files() |
| 94 | - ->name($pattern) |
|
| 95 | - ->in($directories); |
|
| 94 | + ->name($pattern) |
|
| 95 | + ->in($directories); |
|
| 96 | 96 | |
| 97 | 97 | return $finder; |
| 98 | 98 | } |
@@ -62,6 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * {@inheritdoc} |
| 65 | + * @param string $class |
|
| 65 | 66 | */ |
| 66 | 67 | public function getFile($class) |
| 67 | 68 | { |
@@ -70,7 +71,7 @@ discard block |
||
| 70 | 71 | |
| 71 | 72 | /** |
| 72 | 73 | * @param $directories |
| 73 | - * @param $pattern |
|
| 74 | + * @param string $pattern |
|
| 74 | 75 | * |
| 75 | 76 | * @return \Symfony\Component\Finder\Finder |
| 76 | 77 | */ |
@@ -85,9 +86,9 @@ discard block |
||
| 85 | 86 | } |
| 86 | 87 | |
| 87 | 88 | /** |
| 88 | - * @param $path |
|
| 89 | + * @param string $path |
|
| 89 | 90 | * |
| 90 | - * @return mixed |
|
| 91 | + * @return string |
|
| 91 | 92 | */ |
| 92 | 93 | protected function convertPathToNamespace($path) |
| 93 | 94 | { |
@@ -95,6 +96,7 @@ discard block |
||
| 95 | 96 | } |
| 96 | 97 | |
| 97 | 98 | /** |
| 99 | + * @param string $namespace |
|
| 98 | 100 | * @return string |
| 99 | 101 | */ |
| 100 | 102 | public function convertNamespaceToPath($namespace) |
@@ -53,14 +53,14 @@ discard block |
||
| 53 | 53 | $relativePath = $this->convertNamespaceToPath($this->relativeNamespace); |
| 54 | 54 | |
| 55 | 55 | foreach ($this->classLoader->getPrefixesPsr4() as $baseNamespace => $directories) { |
| 56 | - $directories = array_filter(array_map(function ($directory) use ($relativePath) { |
|
| 57 | - return $directory.$relativePath; |
|
| 56 | + $directories = array_filter(array_map(function($directory) use ($relativePath) { |
|
| 57 | + return $directory . $relativePath; |
|
| 58 | 58 | }, $directories), 'is_dir'); |
| 59 | 59 | |
| 60 | 60 | if ($directories) { |
| 61 | 61 | foreach ($this->search($directories, $this->searchPattern) as $file) { |
| 62 | 62 | $relativePathName = $file->getRelativePathname(); |
| 63 | - $classes[] = $baseNamespace.$this->convertPathToNamespace($relativePath.'/'.$relativePathName); |
|
| 63 | + $classes[] = $baseNamespace . $this->convertPathToNamespace($relativePath . '/' . $relativePathName); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -107,6 +107,6 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function convertNamespaceToPath($namespace) |
| 109 | 109 | { |
| 110 | - return '/'.str_replace("\\", '/', trim($namespace, '\\')); |
|
| 110 | + return '/' . str_replace("\\", '/', trim($namespace, '\\')); |
|
| 111 | 111 | } |
| 112 | 112 | } |