From 03b573f19c738d23d9ed9a9f397b684ecf500769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Thu, 19 Mar 2015 11:59:30 +0100 Subject: [PATCH] Some PHPCS fixes. --- lib/Alchemy/Phrasea/Controller/Api/V1.php | 8 ++++- .../Phrasea/Controller/Prod/UploadTest.php | 36 +++++++++++-------- .../Tests/Phrasea/Core/VersionTest.php | 1 - tests/bootstrap.sh | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1.php b/lib/Alchemy/Phrasea/Controller/Api/V1.php index fe463d6cf5..35b8d1a652 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1.php @@ -24,6 +24,7 @@ use Alchemy\Phrasea\Core\Event\RecordEdit; use Alchemy\Phrasea\Core\PhraseaEvents; use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Feed\FeedInterface; +use Alchemy\Phrasea\Model\Entities\ApiOauthToken; use Alchemy\Phrasea\Model\Entities\Basket; use Alchemy\Phrasea\Model\Entities\BasketElement; use Alchemy\Phrasea\Model\Entities\Feed; @@ -73,6 +74,7 @@ class V1 implements ControllerProviderInterface ; $controllers->after(function (Request $request, Response $response) use ($app) { + /** @var ApiOauthToken $token */ $token = $app['session']->get('token'); $app['manipulator.api-log']->create($token->getAccount(), $request, $response); $app['manipulator.api-oauth-token']->setLastUsed($token, new \DateTime()); @@ -551,7 +553,11 @@ class V1 implements ControllerProviderInterface */ public function get_phraseanet_monitor(Application $app, Request $request) { - $ret = array_merge($this->get_config_info($app), $this->get_cache_info($app), $this->get_gv_info($app)); + $ret = array_merge( + $this->get_config_info($app), + $this->get_cache_info($app), + $this->get_gv_info($app) + ); return Result::create($request, $ret)->createResponse(); } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php index 542530577c..a8f6d0696c 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php @@ -8,14 +8,10 @@ use Alchemy\Phrasea\Border\Manager; use DataURI; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Client; class UploadTest extends \PhraseanetAuthenticatedWebTestCase { - /** - * - * @return Client A Client instance - */ - protected $client; protected $tmpFile; public function setUp() @@ -39,8 +35,11 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase */ public function testFlashUploadForm() { - self::$DI['client']->request('GET', '/prod/upload/flash-version/'); - $response = self::$DI['client']->getResponse(); + /** @var Client $client */ + $client = self::$DI['client']; + + $client->request('GET', '/prod/upload/flash-version/'); + $response = $client->getResponse(); $this->assertEquals(200, $response->getStatusCode()); } @@ -50,8 +49,10 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase */ public function testUploadForm() { - self::$DI['client']->request('GET', '/prod/upload/'); - $response = self::$DI['client']->getResponse(); + /** @var Client $client */ + $client = self::$DI['client']; + $client->request('GET', '/prod/upload/'); + $response = $client->getResponse(); $this->assertEquals(200, $response->getStatusCode()); } @@ -79,9 +80,12 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase ) ] ]; - self::$DI['client']->request('POST', '/prod/upload/', $params, $files, ['HTTP_Accept' => 'application/json']); + /** @var Client $client */ + $client = self::$DI['client']; - $response = self::$DI['client']->getResponse(); + $client->request('POST', '/prod/upload/', $params, $files, ['HTTP_Accept' => 'application/json']); + + $response = $client->getResponse(); $this->checkJsonResponse($response); @@ -89,7 +93,9 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase $this->assertTrue($datas['success']); - if ($datas['element'] == 'record') { + $this->assertArrayHasKey('element', $datas); + // Below is useless test as currently a lazaret intance is returned + if ('record' == $datas['element']) { $id = explode('_', $datas['id']); $record = new \record_adapter(self::$DI['app'], $id[0], $id[1]); @@ -121,9 +127,11 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase ) ] ]; - self::$DI['client']->request('POST', '/prod/upload/', $params, $files, ['HTTP_Accept' => 'application/json']); + /** @var Client $client */ + $client = self::$DI['client']; + $client->request('POST', '/prod/upload/', $params, $files, ['HTTP_Accept' => 'application/json']); - $response = self::$DI['client']->getResponse(); + $response = $client->getResponse(); $this->checkJsonResponse($response); diff --git a/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php b/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php index f9c7b1fe07..50a1793fd1 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php +++ b/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php @@ -6,7 +6,6 @@ use Alchemy\Phrasea\Core\Version; class VersionTest extends \PHPUnit_Framework_TestCase { - public function testGetNumber() { $version = new Version(); diff --git a/tests/bootstrap.sh b/tests/bootstrap.sh index f7e53d29b5..b324a84001 100755 --- a/tests/bootstrap.sh +++ b/tests/bootstrap.sh @@ -27,7 +27,7 @@ if ! ./bin/developer system:uninstall > /dev/null 2>&1 then rm -f config/configuration.yml config/configuration-compiled.php fi -./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=fr --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY +./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=en --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY case "$INSTALL_MODE" in update) ./bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs $VERBOSITY