diff --git a/lib/Alchemy/Phrasea/Cache/ApcCache.php b/lib/Alchemy/Phrasea/Cache/ApcCache.php index 92c5b875d0..c6af7bfb1e 100644 --- a/lib/Alchemy/Phrasea/Cache/ApcCache.php +++ b/lib/Alchemy/Phrasea/Cache/ApcCache.php @@ -52,10 +52,10 @@ class ApcCache extends DoctrineApc implements Cache /** * {@inheritdoc} */ - public function deleteMulti(array $arrayKeys) + public function deleteMulti(array $keys) { - foreach ($arrayKeys as $id) { - $this->delete($id); + foreach ($keys as $key) { + $this->delete($key); } return $this; diff --git a/lib/Alchemy/Phrasea/Cache/ArrayCache.php b/lib/Alchemy/Phrasea/Cache/ArrayCache.php index d1c98cfd88..249402b410 100644 --- a/lib/Alchemy/Phrasea/Cache/ArrayCache.php +++ b/lib/Alchemy/Phrasea/Cache/ArrayCache.php @@ -53,10 +53,10 @@ class ArrayCache extends DoctrineArray implements Cache /** * {@inheritdoc} */ - public function deleteMulti(array $arrayKeys) + public function deleteMulti(array $keys) { - foreach ($arrayKeys as $id) { - $this->delete($id); + foreach ($keys as $key) { + $this->delete($key); } return $this; diff --git a/lib/Alchemy/Phrasea/Cache/Cache.php b/lib/Alchemy/Phrasea/Cache/Cache.php index 9524481e37..470f94ee3c 100644 --- a/lib/Alchemy/Phrasea/Cache/Cache.php +++ b/lib/Alchemy/Phrasea/Cache/Cache.php @@ -45,8 +45,8 @@ interface Cache extends DoctrineCache /** * Delete multi cache entries * - * @param array $arrayKeys contains all keys to delete + * @param array $keys contains all keys to delete * @return Alchemy\Phrasea\Cache\Cache */ - public function deleteMulti(array $arrayKeys); + public function deleteMulti(array $keys); } diff --git a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php index 69a9d3eb16..76e32e41c5 100644 --- a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php @@ -52,10 +52,10 @@ class MemcacheCache extends DoctrineMemcache implements Cache /** * {@inheritdoc} */ - public function deleteMulti(array $arrayKeys) + public function deleteMulti(array $keys) { - foreach ($arrayKeys as $id) { - $this->delete($id); + foreach ($keys as $key) { + $this->delete($key); } return $this; diff --git a/lib/Alchemy/Phrasea/Cache/RedisCache.php b/lib/Alchemy/Phrasea/Cache/RedisCache.php index 09236f915e..eb8d103eba 100644 --- a/lib/Alchemy/Phrasea/Cache/RedisCache.php +++ b/lib/Alchemy/Phrasea/Cache/RedisCache.php @@ -120,10 +120,10 @@ class RedisCache extends CacheProvider /** * {@inheritdoc} */ - public function deleteMulti(array $arrayKeys) + public function deleteMulti(array $keys) { - foreach ($arrayKeys as $id) { - $this->delete($id); + foreach ($keys as $key) { + $this->delete($key); } return $this; diff --git a/lib/Alchemy/Phrasea/Cache/XcacheCache.php b/lib/Alchemy/Phrasea/Cache/XcacheCache.php index 8b89f15bb5..e181776e20 100644 --- a/lib/Alchemy/Phrasea/Cache/XcacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/XcacheCache.php @@ -52,10 +52,10 @@ class XcacheCache extends DoctrineXcache implements Cache /** * {@inheritdoc} */ - public function deleteMulti(array $arrayKeys) + public function deleteMulti(array $keys) { - foreach ($arrayKeys as $id) { - $this->delete($id); + foreach ($keys as $key) { + $this->delete($key); } return $this; diff --git a/lib/classes/API/V1/adapter.class.php b/lib/classes/API/V1/adapter.class.php index 691e41b447..ce27ff20ef 100644 --- a/lib/classes/API/V1/adapter.class.php +++ b/lib/classes/API/V1/adapter.class.php @@ -15,7 +15,9 @@ * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ + use Symfony\Component\HttpFoundation\Request; +use Silex\Application; class API_V1_adapter extends API_V1_Abstract { @@ -99,7 +101,7 @@ class API_V1_adapter extends API_V1_Abstract * @param \Silex\Application $app The API silex application * @return \API_V1_result */ - public function get_task_list(\Silex\Application $app) + public function get_task_list(Application $app) { $result = new \API_V1_result($app['request'], $this); @@ -130,7 +132,7 @@ class API_V1_adapter extends API_V1_Abstract * @param type $task_id * @return \API_V1_result */ - public function get_task(\Silex\Application $app, $taskId) + public function get_task(Application $app, $taskId) { $result = new \API_V1_result($app['request'], $this); @@ -166,7 +168,7 @@ class API_V1_adapter extends API_V1_Abstract * @param type $task_id The task id * @return \API_V1_result */ - public function start_task(\Silex\Application $app, $taskId) + public function start_task(Application $app, $taskId) { $result = new \API_V1_result($app['request'], $this); @@ -198,7 +200,7 @@ class API_V1_adapter extends API_V1_Abstract * @param type $task_id The task id * @return \API_V1_result */ - public function stop_task(\Silex\Application $app, $taskId) + public function stop_task(Application $app, $taskId) { $result = new API_V1_result($app['request'], $this); @@ -233,7 +235,7 @@ class API_V1_adapter extends API_V1_Abstract * @return \API_V1_result * @throws \Exception_InvalidArgument */ - public function set_task_property(\Silex\Application $app, $taskId) + public function set_task_property(Application $app, $taskId) { $result = new API_V1_result($app['request'], $this); @@ -283,7 +285,7 @@ class API_V1_adapter extends API_V1_Abstract * @param \Silex\Application $app the silex application * @return array */ - protected function get_cache_info(\Silex\Application $app) + protected function get_cache_info(Application $app) { $mainCache = $app['Core']['Cache']; $opCodeCache = $app['Core']['OpcodeCache']; @@ -317,7 +319,7 @@ class API_V1_adapter extends API_V1_Abstract * @param \Silex\Application $app the silex application * @return array */ - protected function get_config_info(\Silex\Application $app) + protected function get_config_info(Application $app) { $ret = array(); @@ -342,7 +344,7 @@ class API_V1_adapter extends API_V1_Abstract * @param \Silex\Application $app the silex application * @return array */ - protected function get_gv_info(\Silex\Application $app) + protected function get_gv_info(Application $app) { $registry = $app['Core']['Registry']; @@ -516,7 +518,7 @@ class API_V1_adapter extends API_V1_Abstract * @param \Silex\Application $app the silex application * @return \API_V1_result */ - public function get_phraseanet_monitor(\Silex\Application $app) + public function get_phraseanet_monitor(Application $app) { $result = new API_V1_result($app['request'], $this);