@@ -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); |
@@ -54,21 +54,21 @@ discard block |
||
54 | 54 | * @return Collection |
55 | 55 | */ |
56 | 56 | protected function compile(CommandContextInterface $commandContext) { |
57 | - $this->logFile = storage_path('logs/async/' . (string) round(microtime(true) * 1000) . |
|
58 | - mt_rand(1, 10000) . '.log'); |
|
57 | + $this->logFile = storage_path('logs/async/'.(string) round(microtime(true) * 1000). |
|
58 | + mt_rand(1, 10000).'.log'); |
|
59 | 59 | |
60 | 60 | $memoryLimit = config('satis.memory_limit'); |
61 | 61 | $buildVerbosity = config('satis.build_verbosity'); |
62 | 62 | |
63 | 63 | $chunks = new Collection([ |
64 | - 'php' . ($memoryLimit !== null ? ' -dmemory_limit=' . $memoryLimit : ''), |
|
64 | + 'php'.($memoryLimit !== null ? ' -dmemory_limit='.$memoryLimit : ''), |
|
65 | 65 | sprintf($this->executable, DIRECTORY_SEPARATOR), |
66 | - $this->command . ($buildVerbosity !== null ? ' -' . $buildVerbosity : ''), |
|
66 | + $this->command.($buildVerbosity !== null ? ' -'.$buildVerbosity : ''), |
|
67 | 67 | $this->configPath, |
68 | 68 | $this->buildDirectory |
69 | 69 | ]); |
70 | 70 | |
71 | - if($this->item !== null) { |
|
71 | + if ($this->item !== null) { |
|
72 | 72 | $chunks->push($this->item); |
73 | 73 | } |
74 | 74 | |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | $chunks->push($commandContext->getSendMailOnError($email, $message)); |
83 | 83 | } |
84 | 84 | |
85 | - foreach(['http', 'https'] as $protocol) { |
|
85 | + foreach (['http', 'https'] as $protocol) { |
|
86 | 86 | $proxy = $this->proxySettings->get($protocol); |
87 | - if($proxy !== null) { |
|
88 | - $chunks->prepend(strtoupper($protocol) . '_PROXY=' . $proxy); |
|
87 | + if ($proxy !== null) { |
|
88 | + $chunks->prepend(strtoupper($protocol).'_PROXY='.$proxy); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $logger = $commandContext->getLogger(); |
120 | 120 | |
121 | 121 | $logger->info(str_repeat('=', 30)); |
122 | - $logger->info('Running command => ' . PHP_EOL . $commandChunks->implode(' ')); |
|
122 | + $logger->info('Running command => '.PHP_EOL.$commandChunks->implode(' ')); |
|
123 | 123 | |
124 | 124 | chdir($this->directory); |
125 | 125 | |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | |
128 | 128 | chdir($this->currentDirectory); |
129 | 129 | |
130 | - if($commandContext instanceof SyncCommand) { |
|
131 | - $logger->info('Command output => ' . implode(PHP_EOL, $output)); |
|
130 | + if ($commandContext instanceof SyncCommand) { |
|
131 | + $logger->info('Command output => '.implode(PHP_EOL, $output)); |
|
132 | 132 | } else { |
133 | - $logger->notice('Command output can be found in "' . $this->logFile . '".'); |
|
133 | + $logger->notice('Command output can be found in "'.$this->logFile.'".'); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | $this->setCommandOutput($output); |
@@ -176,12 +176,12 @@ discard block |
||
176 | 176 | * @param string $item |
177 | 177 | */ |
178 | 178 | public function setItem($item) { |
179 | - if($item === null) { |
|
179 | + if ($item === null) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
183 | - if(preg_match(Repository::REGEX, $item)) { |
|
184 | - $this->item = '--repository-url ' . escapeshellarg($item); |
|
183 | + if (preg_match(Repository::REGEX, $item)) { |
|
184 | + $this->item = '--repository-url '.escapeshellarg($item); |
|
185 | 185 | } else { |
186 | 186 | $this->item = escapeshellarg($item); |
187 | 187 | } |
@@ -216,8 +216,8 @@ discard block |
||
216 | 216 | public function run($asyncMode = true) { |
217 | 217 | # -- force sync |
218 | 218 | #if(true) { |
219 | - if($asyncMode === false || $this->isWindows() === true) { |
|
220 | - if($this->isWindows() === true) { |
|
219 | + if ($asyncMode === false || $this->isWindows() === true) { |
|
220 | + if ($this->isWindows() === true) { |
|
221 | 221 | $this->getLogger() |
222 | 222 | ->warn('OS does not support async mode, forcing sync.'); |
223 | 223 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | $result = $this->exec(new SyncCommand()); |
241 | 241 | |
242 | - if($result !== 0) { |
|
242 | + if ($result !== 0) { |
|
243 | 243 | throw new PackageBuildFailedException('Package build failed. Check build log for details.'); |
244 | 244 | } |
245 | 245 |
@@ -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) { |
@@ -89,19 +89,19 @@ 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 | - throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
|
104 | + throw new RepositoryNotFoundException('Repository with ID "'.$repositoryId.'" does not exist.'); |
|
105 | 105 | } |
106 | 106 | } else { |
107 | 107 | $repositoryId = static::nameToId($repository->getUrl()); |
@@ -130,19 +130,19 @@ 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 | - throw new PackageNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
|
145 | + throw new PackageNotFoundException('Package with ID "'.$packageId.'" does not exist.'); |
|
146 | 146 | } |
147 | 147 | } else { |
148 | 148 | $packageId = static::nameToId($package->getName()); |
@@ -165,10 +165,10 @@ 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 | - throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
|
171 | + throw new RepositoryNotFoundException('Repository with ID "'.$repositoryId.'" does not exist.'); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | $this->setDisableBuild(true); |
@@ -183,10 +183,10 @@ 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 | - throw new RepositoryNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
|
189 | + throw new RepositoryNotFoundException('Package with ID "'.$packageId.'" does not exist.'); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | $this->setDisableBuild(true); |
@@ -224,32 +224,32 @@ discard block |
||
224 | 224 | * @throws \Exception |
225 | 225 | */ |
226 | 226 | public function __call($method, array $arguments) { |
227 | - $method = $this->hiddenEntityPrefix . $method; |
|
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 | |
237 | - array_unshift($arguments, $this->satis->{'get' . ucfirst($type)}()); |
|
237 | + array_unshift($arguments, $this->satis->{'get'.ucfirst($type)}()); |
|
238 | 238 | |
239 | 239 | try { |
240 | 240 | $items = call_user_func_array([$this, $method], $arguments); |
241 | - } catch(\Exception $e) { |
|
242 | - $logger->info('Response => ' . $e->getMessage()); |
|
241 | + } catch (\Exception $e) { |
|
242 | + $logger->info('Response => '.$e->getMessage()); |
|
243 | 243 | $logger->info(str_repeat('=', 30)); |
244 | 244 | |
245 | 245 | throw $e; |
246 | 246 | } |
247 | 247 | |
248 | - $this->satis->{'set' . $type}($items); |
|
248 | + $this->satis->{'set'.$type}($items); |
|
249 | 249 | |
250 | 250 | return $this->save(); |
251 | 251 | } else { |
252 | - throw new BadMethodCallException('Called method "' . $method . '" does not exist.'); |
|
252 | + throw new BadMethodCallException('Called method "'.$method.'" does not exist.'); |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | public function __get($property) { |
261 | 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,9 +287,9 @@ 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)) { |
|
292 | - throw new RepositoryNotFoundException('Repository with ID "' . $repositoryId . '" does not exist.'); |
|
290 | + if ($repositoryId !== null) { |
|
291 | + if (!$repositoryCollection->has($repositoryId)) { |
|
292 | + throw new RepositoryNotFoundException('Repository with ID "'.$repositoryId.'" does not exist.'); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | $output = $repositoryCollection->get($repositoryId); |
@@ -308,9 +308,9 @@ 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)) { |
|
313 | - throw new PackageNotFoundException('Package with ID "' . $packageId . '" does not exist.'); |
|
311 | + if ($packageId !== null) { |
|
312 | + if (!$packageCollection->has($packageId)) { |
|
313 | + throw new PackageNotFoundException('Package with ID "'.$packageId.'" does not exist.'); |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | $output = $packageCollection->get($packageId); |
@@ -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 |
@@ -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(); |
@@ -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('name')) |
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(); |
@@ -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(); |
@@ -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 |
@@ -18,7 +18,7 @@ |
||
18 | 18 | * @return $this |
19 | 19 | */ |
20 | 20 | public function put($key, $value) { |
21 | - if(!$value instanceof Repository) { |
|
21 | + if (!$value instanceof Repository) { |
|
22 | 22 | throw new InvalidArgumentException('RepositoryCollection accepts only elements of "Repository" type.'); |
23 | 23 | } |
24 | 24 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException |
27 | 27 | */ |
28 | 28 | protected function getLockFile() { |
29 | - if($this->filesystem->exists($this->lockFilename)) { |
|
29 | + if ($this->filesystem->exists($this->lockFilename)) { |
|
30 | 30 | $configLock = $this->serializer->deserialize( |
31 | 31 | $this->filesystem->get($this->lockFilename), |
32 | 32 | 'App\Satis\Model\ConfigLock', |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | public function lock($repositoryId) { |
79 | 79 | $lockedRepositories = $this->getLockedRepositories(); |
80 | 80 | |
81 | - if(!is_null($repositoryId) && !$lockedRepositories->contains($repositoryId)) { |
|
81 | + if (!is_null($repositoryId) && !$lockedRepositories->contains($repositoryId)) { |
|
82 | 82 | $lockedRepositories->push($repositoryId); |
83 | 83 | } |
84 | 84 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | public function unlock($repositoryId = null) { |
100 | 100 | $lockedRepositories = $this->getLockedRepositories(); |
101 | 101 | |
102 | - if($repositoryId !== null && $lockedRepositories->contains($repositoryId)) { |
|
102 | + if ($repositoryId !== null && $lockedRepositories->contains($repositoryId)) { |
|
103 | 103 | $lockedRepositories = $lockedRepositories->filter(function($id) use($repositoryId) { |
104 | 104 | return $id !== $repositoryId; |
105 | 105 | }); |