@@ -37,10 +37,10 @@ |
||
37 | 37 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
38 | 38 | use Symfony\Component\HttpKernel\Bundle\Bundle; |
39 | 39 | use Symfony\Component\HttpKernel\KernelInterface; |
40 | +use Tenside\CoreBundle\Command\SelfUpdateCommand; |
|
40 | 41 | use Tenside\Core\Composer\ComposerJson; |
41 | 42 | use Tenside\Core\Tenside; |
42 | 43 | use Tenside\Core\Util\RuntimeHelper; |
43 | -use Tenside\CoreBundle\Command\SelfUpdateCommand; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * The console application that handles the commands. |
@@ -27,11 +27,11 @@ |
||
27 | 27 | use Symfony\Component\HttpFoundation\Request; |
28 | 28 | use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; |
29 | 29 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
30 | +use Tenside\CoreBundle\Annotation\ApiDescription; |
|
30 | 31 | use Tenside\CoreBundle\Security\UserInformation; |
31 | 32 | use Tenside\CoreBundle\Security\UserInformationInterface; |
32 | 33 | use Tenside\Core\Task\Composer\InstallTask; |
33 | 34 | use Tenside\Core\Util\JsonArray; |
34 | -use Tenside\CoreBundle\Annotation\ApiDescription; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Controller for manipulating the composer.json file. |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | return 0; |
158 | 158 | } |
159 | 159 | |
160 | - $tempFilename = $tmpDir . '/' . basename($localFilename, '.phar').'-temp.phar'; |
|
160 | + $tempFilename = $tmpDir . '/' . basename($localFilename, '.phar') . '-temp.phar'; |
|
161 | 161 | $backupFile = sprintf( |
162 | 162 | '%s/%s-%s%s', |
163 | 163 | $rollbackDir, |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | } |
184 | 184 | |
185 | 185 | if ($err = $this->setLocalPhar($localFilename, $tempFilename, $backupFile)) { |
186 | - $inputOutput->writeError('<error>The file is corrupted ('.$err->getMessage().').</error>'); |
|
186 | + $inputOutput->writeError('<error>The file is corrupted (' . $err->getMessage() . ').</error>'); |
|
187 | 187 | $inputOutput->writeError('<error>Please re-run the self-update command to try again.</error>'); |
188 | 188 | |
189 | 189 | return 1; |
@@ -249,10 +249,10 @@ discard block |
||
249 | 249 | $old = $rollbackDir . '/' . $rollbackVersion . self::OLD_INSTALL_EXT; |
250 | 250 | |
251 | 251 | if (!is_file($old)) { |
252 | - throw new FilesystemException('Composer rollback failed: "'.$old.'" could not be found'); |
|
252 | + throw new FilesystemException('Composer rollback failed: "' . $old . '" could not be found'); |
|
253 | 253 | } |
254 | 254 | if (!is_readable($old)) { |
255 | - throw new FilesystemException('Composer rollback failed: "'.$old.'" could not be read'); |
|
255 | + throw new FilesystemException('Composer rollback failed: "' . $old . '" could not be read'); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | $oldFile = sprintf('%s/"%s"', $rollbackDir, $rollbackVersion, self::OLD_INSTALL_EXT); |