@@ -104,7 +104,7 @@ |
||
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * @param CommandContextInterface $commandContext |
| 107 | - * @return mixed |
|
| 107 | + * @return integer|null |
|
| 108 | 108 | */ |
| 109 | 109 | protected function exec(CommandContextInterface $commandContext) { |
| 110 | 110 | $commandChunks = $this->compile($commandContext); |
@@ -67,16 +67,16 @@ discard block |
||
| 67 | 67 | $this->buildDirectory |
| 68 | 68 | ]); |
| 69 | 69 | |
| 70 | - if($this->item !== null) { |
|
| 70 | + if ($this->item !== null) { |
|
| 71 | 71 | $chunks->push($this->item); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $chunks->push($commandContext->getOutputRedirection($this->logFile)); |
| 75 | 75 | $chunks->push($commandContext->getShouldUnlockOnCompletion()); |
| 76 | 76 | |
| 77 | - foreach(['http', 'https'] as $protocol) { |
|
| 77 | + foreach (['http', 'https'] as $protocol) { |
|
| 78 | 78 | $proxy = $this->proxySettings->get($protocol); |
| 79 | - if($proxy !== null) { |
|
| 79 | + if ($proxy !== null) { |
|
| 80 | 80 | $chunks->prepend(strtoupper($protocol) . '_PROXY=' . $proxy); |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | chdir($this->currentDirectory); |
| 121 | 121 | |
| 122 | - if($commandContext instanceof SyncCommand) { |
|
| 122 | + if ($commandContext instanceof SyncCommand) { |
|
| 123 | 123 | $logger->info('Command output => ' . implode(PHP_EOL, $output)); |
| 124 | 124 | } else { |
| 125 | 125 | $logger->notice('Command output can be found in "' . $this->logFile . '".'); |
@@ -168,11 +168,11 @@ discard block |
||
| 168 | 168 | * @param string $item |
| 169 | 169 | */ |
| 170 | 170 | public function setItem($item) { |
| 171 | - if($item === null) { |
|
| 171 | + if ($item === null) { |
|
| 172 | 172 | return; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if(filter_var($item, FILTER_VALIDATE_URL)) { |
|
| 175 | + if (filter_var($item, FILTER_VALIDATE_URL)) { |
|
| 176 | 176 | $this->item = '--repository-url ' . escapeshellarg($item); |
| 177 | 177 | } else { |
| 178 | 178 | $this->item = escapeshellarg($item); |
@@ -208,8 +208,8 @@ discard block |
||
| 208 | 208 | public function run($asyncMode = true) { |
| 209 | 209 | # -- force sync |
| 210 | 210 | #if(true) { |
| 211 | - if($asyncMode === false || $this->isWindows() === true) { |
|
| 212 | - if($this->isWindows() === true) { |
|
| 211 | + if ($asyncMode === false || $this->isWindows() === true) { |
|
| 212 | + if ($this->isWindows() === true) { |
|
| 213 | 213 | $this->getLogger() |
| 214 | 214 | ->warn('OS does not support async mode, forcing sync.'); |
| 215 | 215 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | $result = $this->exec(new SyncCommand()); |
| 233 | 233 | |
| 234 | - if($result !== 0) { |
|
| 234 | + if ($result !== 0) { |
|
| 235 | 235 | throw new PackageBuildFailedException('Package build failed. Check build log for details.'); |
| 236 | 236 | } |
| 237 | 237 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * @param \App\Satis\Collections\PackageCollection $packageCollection |
| 122 | 122 | * @param string $packageId |
| 123 | 123 | * @param \Illuminate\Support\Collection $input |
| 124 | - * @return \App\Satis\Collections\RepositoryCollection |
|
| 124 | + * @return PackageCollection |
|
| 125 | 125 | * @throws \App\Satis\Exceptions\PackageNotFoundException |
| 126 | 126 | */ |
| 127 | 127 | protected function _addOrUpdatePackage(PackageCollection $packageCollection, $packageId, |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | /** |
| 180 | 180 | * @param \App\Satis\Collections\PackageCollection $packageCollection |
| 181 | 181 | * @param string $packageId |
| 182 | - * @return \App\Satis\Collections\RepositoryCollection |
|
| 182 | + * @return PackageCollection |
|
| 183 | 183 | * @throws \App\Satis\Exceptions\RepositoryNotFoundException |
| 184 | 184 | */ |
| 185 | 185 | protected function _deletePackage(PackageCollection $packageCollection, $packageId) { |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | * @author Lukas Homza <[email protected]> |
| 10 | 10 | */ |
| 11 | 11 | class PrivateRepository extends BuildContext { |
| 12 | - /** |
|
| 12 | + /** |
|
| 13 | 13 | * @return int |
| 14 | 14 | */ |
| 15 | 15 | public function getType() { |
| 16 | 16 | return ConfigBuilder::PRIVATE_REPOSITORY; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - /** |
|
| 19 | + /** |
|
| 20 | 20 | * @return string |
| 21 | 21 | */ |
| 22 | 22 | public function getConfigFile() { |
@@ -89,16 +89,16 @@ discard block |
||
| 89 | 89 | $repository->setUrl($input->get('url')); |
| 90 | 90 | $repository->setType($input->get('type', config('satis.default_repository_type'))); |
| 91 | 91 | |
| 92 | - if($input->has('async_mode')) { |
|
| 92 | + if ($input->has('async_mode')) { |
|
| 93 | 93 | $this->configBuilder->setAsyncMode(filter_var($input->get('async_mode'), FILTER_VALIDATE_BOOLEAN)); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - if($input->has('disable_build')) { |
|
| 96 | + if ($input->has('disable_build')) { |
|
| 97 | 97 | $this->setDisableBuild(filter_var($input->get('disable_build'), FILTER_VALIDATE_BOOLEAN)); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - if($repositoryId !== null) { |
|
| 101 | - if($repositoryCollection->has($repositoryId)) { |
|
| 100 | + if ($repositoryId !== null) { |
|
| 101 | + if ($repositoryCollection->has($repositoryId)) { |
|
| 102 | 102 | $repositoryCollection->put($repositoryId, $repository); |
| 103 | 103 | } else { |
| 104 | 104 | throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
@@ -130,16 +130,16 @@ discard block |
||
| 130 | 130 | $package = new Package(); |
| 131 | 131 | $package->setName($input->get('name')); |
| 132 | 132 | |
| 133 | - if($input->has('async_mode')) { |
|
| 133 | + if ($input->has('async_mode')) { |
|
| 134 | 134 | $this->configBuilder->setAsyncMode(filter_var($input->get('async_mode'), FILTER_VALIDATE_BOOLEAN)); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if($input->has('disable_build')) { |
|
| 137 | + if ($input->has('disable_build')) { |
|
| 138 | 138 | $this->setDisableBuild(filter_var($input->get('disable_build'), FILTER_VALIDATE_BOOLEAN)); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - if($packageId !== null) { |
|
| 142 | - if($packageCollection->has($packageId)) { |
|
| 141 | + if ($packageId !== null) { |
|
| 142 | + if ($packageCollection->has($packageId)) { |
|
| 143 | 143 | $packageCollection->put($packageId, $package); |
| 144 | 144 | } else { |
| 145 | 145 | throw new PackageNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @throws \App\Satis\Exceptions\RepositoryNotFoundException |
| 166 | 166 | */ |
| 167 | 167 | protected function _deleteRepository(RepositoryCollection $repositoryCollection, $repositoryId) { |
| 168 | - if($repositoryCollection->has($repositoryId)) { |
|
| 168 | + if ($repositoryCollection->has($repositoryId)) { |
|
| 169 | 169 | $repositoryCollection->forget($repositoryId); |
| 170 | 170 | } else { |
| 171 | 171 | throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * @throws \App\Satis\Exceptions\RepositoryNotFoundException |
| 184 | 184 | */ |
| 185 | 185 | protected function _deletePackage(PackageCollection $packageCollection, $packageId) { |
| 186 | - if($packageCollection->has($packageId)) { |
|
| 186 | + if ($packageCollection->has($packageId)) { |
|
| 187 | 187 | $packageCollection->forget($packageId); |
| 188 | 188 | } else { |
| 189 | 189 | throw new RepositoryNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
@@ -226,11 +226,11 @@ discard block |
||
| 226 | 226 | public function __call($method, array $arguments) { |
| 227 | 227 | $method = $this->hiddenEntityPrefix . $method; |
| 228 | 228 | |
| 229 | - if(method_exists($this, $method)) { |
|
| 229 | + if (method_exists($this, $method)) { |
|
| 230 | 230 | $logger = $this->getLogger(); |
| 231 | 231 | |
| 232 | 232 | $logger->info(str_repeat('=', 30)); |
| 233 | - $logger->info('Request => ' . \Request::method() . ' (' . $method .') => '. json_encode($arguments)); |
|
| 233 | + $logger->info('Request => ' . \Request::method() . ' (' . $method . ') => ' . json_encode($arguments)); |
|
| 234 | 234 | |
| 235 | 235 | $type = str_plural(last(explode('_', snake_case($method))), 2); |
| 236 | 236 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | |
| 239 | 239 | try { |
| 240 | 240 | $items = call_user_func_array([$this, $method], $arguments); |
| 241 | - } catch(\Exception $e) { |
|
| 241 | + } catch (\Exception $e) { |
|
| 242 | 242 | $logger->info('Response => ' . $e->getMessage()); |
| 243 | 243 | $logger->info(str_repeat('=', 30)); |
| 244 | 244 | |
@@ -258,9 +258,9 @@ discard block |
||
| 258 | 258 | * @return mixed |
| 259 | 259 | */ |
| 260 | 260 | public function __get($property) { |
| 261 | - $property = $this->hiddenEntityPrefix.$property; |
|
| 261 | + $property = $this->hiddenEntityPrefix . $property; |
|
| 262 | 262 | |
| 263 | - if(isset($this->lazyLoadedProperties[$property])) { |
|
| 263 | + if (isset($this->lazyLoadedProperties[$property])) { |
|
| 264 | 264 | $this->{$property} = $this->{$this->lazyLoadedProperties[$property]}(); |
| 265 | 265 | |
| 266 | 266 | unset($this->lazyLoadedProperties[$property]); |
@@ -287,8 +287,8 @@ discard block |
||
| 287 | 287 | public function getRepositories($repositoryId = null) { |
| 288 | 288 | $repositoryCollection = $this->satis->getRepositories(); |
| 289 | 289 | |
| 290 | - if($repositoryId !== null) { |
|
| 291 | - if(!$repositoryCollection->has($repositoryId)) { |
|
| 290 | + if ($repositoryId !== null) { |
|
| 291 | + if (!$repositoryCollection->has($repositoryId)) { |
|
| 292 | 292 | throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
| 293 | 293 | } |
| 294 | 294 | |
@@ -308,8 +308,8 @@ discard block |
||
| 308 | 308 | public function getPackages($packageId = null) { |
| 309 | 309 | $packageCollection = $this->satis->getPackages(); |
| 310 | 310 | |
| 311 | - if($packageId !== null) { |
|
| 312 | - if(!$packageCollection->has($packageId)) { |
|
| 311 | + if ($packageId !== null) { |
|
| 312 | + if (!$packageCollection->has($packageId)) { |
|
| 313 | 313 | throw new PackageNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
| 314 | 314 | } |
| 315 | 315 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | * @param \App\Satis\BuildContext $buildContext |
| 326 | 326 | */ |
| 327 | 327 | public function forceBuild(BuildContext $buildContext) { |
| 328 | - if($buildContext->getItemName() !== null) { |
|
| 328 | + if ($buildContext->getItemName() !== null) { |
|
| 329 | 329 | $buildContext->setItemId(self::nameToId($buildContext->getItemName())); |
| 330 | 330 | } |
| 331 | 331 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | $this->configPersister->updateWith($satisConfig); |
| 358 | 358 | |
| 359 | - if($this->disableBuild === false) { |
|
| 359 | + if ($this->disableBuild === false) { |
|
| 360 | 360 | return $this->configBuilder->build(); |
| 361 | 361 | } |
| 362 | 362 | |
@@ -28,6 +28,6 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function handle() |
| 30 | 30 | { |
| 31 | - $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL); |
|
| 31 | + $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | $configFile = config('satis.config'); |
| 47 | 47 | |
| 48 | - if($this->filesystem->exists($configFile)) { |
|
| 48 | + if ($this->filesystem->exists($configFile)) { |
|
| 49 | 49 | chmod($configFile, 777); |
| 50 | 50 | } else { |
| 51 | 51 | $this->error("\n" . 'Satis config file "' . $configFile . '" does not exist. |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | { |
| 46 | 46 | if ($e instanceof ModelNotFoundException) { |
| 47 | 47 | $e = new NotFoundHttpException($e->getMessage(), $e); |
| 48 | - } elseif($e instanceof HttpException && \App::isLocal() === false) { |
|
| 48 | + } elseif ($e instanceof HttpException && \App::isLocal() === false) { |
|
| 49 | 49 | Response::json(['result' => false, 'message' => $e->getMessage()]) |
| 50 | 50 | ->setStatusCode($e->getStatusCode()) |
| 51 | 51 | ->send(); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $repositories = $configManager->getRepositories($repositoryId); |
| 66 | 66 | |
| 67 | 67 | Response::make($repositories) |
| 68 | - ->send(); |
|
| 68 | + ->send(); |
|
| 69 | 69 | } catch(RepositoryNotFoundException $e) { |
| 70 | 70 | Response::json() |
| 71 | 71 | ->setStatusCode(404) |
@@ -117,5 +117,5 @@ discard block |
||
| 117 | 117 | ->setStatusCode(500) |
| 118 | 118 | ->send(); |
| 119 | 119 | } |
| 120 | - } |
|
| 120 | + } |
|
| 121 | 121 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | ] |
| 35 | 35 | ); |
| 36 | 36 | |
| 37 | - if($validator->fails()) { |
|
| 37 | + if ($validator->fails()) { |
|
| 38 | 38 | Response::json($validator->errors()->first('url')) |
| 39 | 39 | ->setStatusCode(400) |
| 40 | 40 | ->send(); |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | Response::json(['command_output' => $output]) |
| 46 | 46 | ->send(); |
| 47 | - } catch(PackageBuildFailedException $e) { |
|
| 47 | + } catch (PackageBuildFailedException $e) { |
|
| 48 | 48 | Response::json() |
| 49 | 49 | ->setStatusCode(500) |
| 50 | 50 | ->send(); |
| 51 | - } catch(RepositoryNotFoundException $e) { |
|
| 51 | + } catch (RepositoryNotFoundException $e) { |
|
| 52 | 52 | Response::json() |
| 53 | 53 | ->setStatusCode(404) |
| 54 | 54 | ->send(); |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | Response::make($repositories) |
| 68 | 68 | ->send(); |
| 69 | - } catch(RepositoryNotFoundException $e) { |
|
| 69 | + } catch (RepositoryNotFoundException $e) { |
|
| 70 | 70 | Response::json() |
| 71 | 71 | ->setStatusCode(404) |
| 72 | 72 | ->send(); |
| 73 | - } catch(PackageBuildFailedException $e) { |
|
| 73 | + } catch (PackageBuildFailedException $e) { |
|
| 74 | 74 | Response::json($e->getMessage()) |
| 75 | 75 | ->setStatusCode(500) |
| 76 | 76 | ->send(); |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | Response::json() |
| 110 | 110 | ->send(); |
| 111 | - } catch(RepositoryNotFoundException $e) { |
|
| 111 | + } catch (RepositoryNotFoundException $e) { |
|
| 112 | 112 | Response::json() |
| 113 | 113 | ->setStatusCode(404) |
| 114 | 114 | ->send(); |
| 115 | - } catch(PackageBuildFailedException $e) { |
|
| 115 | + } catch (PackageBuildFailedException $e) { |
|
| 116 | 116 | Response::json($e->getMessage()) |
| 117 | 117 | ->setStatusCode(500) |
| 118 | 118 | ->send(); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @author Lukas Homza <[email protected]> |
| 19 | 19 | */ |
| 20 | 20 | class Controller extends BaseController { |
| 21 | - /** |
|
| 21 | + /** |
|
| 22 | 22 | * @param \App\Satis\ConfigManager $configManager |
| 23 | 23 | * @param \App\Satis\BuildContext $buildContext |
| 24 | 24 | * @param \Illuminate\Http\Request $request |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | ]); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - /** |
|
| 76 | + /** |
|
| 77 | 77 | * @param \App\Satis\ConfigManager $configManager |
| 78 | 78 | * @param \Illuminate\Http\Request $request |
| 79 | 79 | */ |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $this->build($configManager, new PrivateRepository(), $request); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - /** |
|
| 84 | + /** |
|
| 85 | 85 | * @param \App\Satis\ConfigManager $configManager |
| 86 | 86 | * @param \Illuminate\Http\Request $request |
| 87 | 87 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * @param \Illuminate\Http\Request $request |
| 25 | 25 | */ |
| 26 | 26 | protected function build(ConfigManager $configManager, BuildContext $buildContext, Request $request) { |
| 27 | - if($request->ajax()) { |
|
| 27 | + if ($request->ajax()) { |
|
| 28 | 28 | $buildContext->setItemName($request->get('what')); |
| 29 | 29 | |
| 30 | 30 | $configManager->forceBuild($buildContext); |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | ->setConfig($configManager->getDefinition()) |
| 54 | 54 | ->setRepositoryTypes(config('satis.repository_types')) |
| 55 | 55 | ->isLoaded(true); |
| 56 | - } catch(Exception $e) { |
|
| 56 | + } catch (Exception $e) { |
|
| 57 | 57 | $message = $e->getMessage(); |
| 58 | - if($e instanceof FileNotFoundException) { |
|
| 58 | + if ($e instanceof FileNotFoundException) { |
|
| 59 | 59 | $message = trans('satis.not_found'); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function map(Router $router) |
| 39 | 39 | { |
| 40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
| 40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
| 41 | 41 | require app_path('Http/routes.php'); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | * @return $this |
| 19 | 19 | */ |
| 20 | 20 | public function put($key, $value) { |
| 21 | - if(!$value instanceof Package) { |
|
| 21 | + if (!$value instanceof Package) { |
|
| 22 | 22 | throw new InvalidArgumentException('PackageCollection accepts only elements of "Package" type.'); |
| 23 | 23 | } |
| 24 | 24 | |