hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use short array notation

Browse Source
This commit is contained in:
Romain Neutron
2014-03-01 14:44:53 +01:00
parent b836dc8632
commit d8e4ea5a41
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Controller/Api/V1.php
View File

@@ -67,31 +67,31 @@ class V1 implements ControllerProviderInterface
}); });
$controllers->get('/monitor/scheduler/', 'controller.api.v1:get_scheduler') $controllers->get('/monitor/scheduler/', 'controller.api.v1:get_scheduler')
->before(array($this, 'ensureAdmin')); ->before([$this, 'ensureAdmin']);
$controllers->get('/monitor/tasks/', 'controller.api.v1:get_task_list') $controllers->get('/monitor/tasks/', 'controller.api.v1:get_task_list')
->before(array($this, 'ensureAdmin')); ->before([$this, 'ensureAdmin']);
$controllers->get('/monitor/task/{task}/', 'controller.api.v1:get_task') $controllers->get('/monitor/task/{task}/', 'controller.api.v1:get_task')
->convert('task', [$app['converter.task'], 'convert']) ->convert('task', [$app['converter.task'], 'convert'])
->before(array($this, 'ensureAdmin')) ->before([$this, 'ensureAdmin'])
->assert('task', '\d+'); ->assert('task', '\d+');
$controllers->post('/monitor/task/{task}/', 'controller.api.v1:set_task_property') $controllers->post('/monitor/task/{task}/', 'controller.api.v1:set_task_property')
->convert('task', [$app['converter.task'], 'convert']) ->convert('task', [$app['converter.task'], 'convert'])
->before(array($this, 'ensureAdmin')) ->before([$this, 'ensureAdmin'])
->assert('task', '\d+'); ->assert('task', '\d+');
$controllers->post('/monitor/task/{task}/start/', 'controller.api.v1:start_task') $controllers->post('/monitor/task/{task}/start/', 'controller.api.v1:start_task')
->convert('task', [$app['converter.task'], 'convert']) ->convert('task', [$app['converter.task'], 'convert'])
->before(array($this, 'ensureAdmin')); ->before([$this, 'ensureAdmin']);
$controllers->post('/monitor/task/{task}/stop/', 'controller.api.v1:stop_task') $controllers->post('/monitor/task/{task}/stop/', 'controller.api.v1:stop_task')
->convert('task', [$app['converter.task'], 'convert']) ->convert('task', [$app['converter.task'], 'convert'])
->before(array($this, 'ensureAdmin')); ->before([$this, 'ensureAdmin']);
$controllers->get('/monitor/phraseanet/', 'controller.api.v1:get_phraseanet_monitor') $controllers->get('/monitor/phraseanet/', 'controller.api.v1:get_phraseanet_monitor')
->before(array($this, 'ensureAdmin')); ->before([$this, 'ensureAdmin']);
$controllers->get('/databoxes/list/', 'controller.api.v1:get_databoxes'); $controllers->get('/databoxes/list/', 'controller.api.v1:get_databoxes');

2
lib/Alchemy/Phrasea/TaskManager/Notifier.php
View File

@@ -86,7 +86,7 @@ class Notifier
return $data['reply']; return $data['reply'];
} catch (\ZMQSocketException $e) { } catch (\ZMQSocketException $e) {
$this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $this->timeout), array('exception' => $e)); $this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $this->timeout), ['exception' => $e]);
throw new RuntimeException('Unable to retrieve information.', $e->getCode(), $e); throw new RuntimeException('Unable to retrieve information.', $e->getCode(), $e);
} }
} }

2
lib/classes/Bridge/Api/Dailymotion.php
View File

@@ -571,7 +571,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
switch ($record->get_type()) { switch ($record->get_type()) {
case self::ELEMENT_TYPE_VIDEO : case self::ELEMENT_TYPE_VIDEO :
$url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token); $url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token);
$options = array_merge(array('url' => $url_file), $options); $options = array_merge(['url' => $url_file], $options);
$video = $this->_api->call('POST /me/videos', $options, $this->oauth_token); $video = $this->_api->call('POST /me/videos', $options, $this->oauth_token);
return $video["id"]; return $video["id"];

2
tests/Alchemy/Tests/Phrasea/Controller/Api/ResultTest.php
View File

@@ -129,7 +129,7 @@ class ResultTest extends \PhraseanetAuthenticatedTestCase
$apiResult = new Result(new Request(), []); $apiResult = new Result(new Request(), []);
$content = json_decode($apiResult->createResponse()->getContent(), true); $content = json_decode($apiResult->createResponse()->getContent(), true);
$this->assertSame(array(), $content['response']); $this->assertSame([], $content['response']);
} }
public function testContentType() public function testContentType()