@@ -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. |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | use Symfony\Component\HttpFoundation\Request; |
| 28 | 28 | use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; |
| 29 | 29 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 30 | -use Tenside\Core\Util\PhpProcessSpawner; |
|
| 31 | 30 | use Tenside\CoreBundle\Annotation\ApiDescription; |
| 32 | 31 | use Tenside\Core\Task\Task; |
| 33 | 32 | use Tenside\Core\Util\JsonArray; |
| 33 | +use Tenside\Core\Util\PhpProcessSpawner; |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Lists and executes queued tasks. |
@@ -420,7 +420,7 @@ |
||
| 420 | 420 | * |
| 421 | 421 | * @param bool $addOutput Flag determining if the output shall get added or not. |
| 422 | 422 | * |
| 423 | - * @param null $outputOffset The output offset to use. |
|
| 423 | + * @param integer|null $outputOffset The output offset to use. |
|
| 424 | 424 | * |
| 425 | 425 | * @return array |
| 426 | 426 | */ |
@@ -156,7 +156,7 @@ |
||
| 156 | 156 | $errors = str_replace(dirname($tempFile), '', $errors); |
| 157 | 157 | $warnings = str_replace(dirname($tempFile), '', $warnings); |
| 158 | 158 | |
| 159 | - $lineMapper = function ($str) { |
|
| 159 | + $lineMapper = function($str) { |
|
| 160 | 160 | if (preg_match('#Parse error on line (\d+)#', $str, $match)) { |
| 161 | 161 | return ['line' => $match[1], 'msg' => $str]; |
| 162 | 162 | } |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | use Symfony\Component\HttpFoundation\Request; |
| 28 | 28 | use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; |
| 29 | 29 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 30 | -use Tenside\Core\Util\PhpProcessSpawner; |
|
| 31 | 30 | use Tenside\CoreBundle\Annotation\ApiDescription; |
| 32 | 31 | use Tenside\Core\Task\Task; |
| 33 | 32 | use Tenside\Core\Util\JsonArray; |
| 33 | +use Tenside\Core\Util\PhpProcessSpawner; |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Lists and executes queued tasks. |
@@ -22,16 +22,16 @@ |
||
| 22 | 22 | |
| 23 | 23 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 24 | 24 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 25 | -use Tenside\Core\SelfTest\Cli\SelfTestCliCanFork; |
|
| 26 | -use Tenside\Core\SelfTest\Cli\SelfTestCliOsChecks; |
|
| 27 | -use Tenside\Core\SelfTest\Php\SelfTestEnvPopulated; |
|
| 28 | 25 | use Tenside\CoreBundle\Annotation\ApiDescription; |
| 29 | 26 | use Tenside\Core\SelfTest\Cli\SelfTestCanSpawnProcesses; |
| 30 | 27 | use Tenside\Core\SelfTest\Cli\SelfTestCliArguments; |
| 28 | +use Tenside\Core\SelfTest\Cli\SelfTestCliCanFork; |
|
| 29 | +use Tenside\Core\SelfTest\Cli\SelfTestCliOsChecks; |
|
| 31 | 30 | use Tenside\Core\SelfTest\Cli\SelfTestCliRuntime; |
| 32 | 31 | use Tenside\Core\SelfTest\Generic\SelfTestCalledViaHttps; |
| 33 | 32 | use Tenside\Core\SelfTest\Generic\SelfTestFileOwnerMatches; |
| 34 | 33 | use Tenside\Core\SelfTest\Php\SelfTestAllowUrlFopenEnabled; |
| 34 | +use Tenside\Core\SelfTest\Php\SelfTestEnvPopulated; |
|
| 35 | 35 | use Tenside\Core\SelfTest\Php\SelfTestSuhosin; |
| 36 | 36 | use Tenside\Core\SelfTest\SelfTest; |
| 37 | 37 | |
@@ -25,8 +25,8 @@ |
||
| 25 | 25 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
| 26 | 26 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 27 | 27 | use Symfony\Component\HttpFoundation\Request; |
| 28 | -use Tenside\Core\Util\JsonArray; |
|
| 29 | 28 | use Tenside\CoreBundle\Annotation\ApiDescription; |
| 29 | +use Tenside\Core\Util\JsonArray; |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Validation of version constraints. |