diff --git a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php index 072ced6891..6d824962ff 100644 --- a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php @@ -11,7 +11,7 @@ namespace Alchemy\Phrasea\Cache; -use \Doctrine\Common\Cache\MemcacheCache as DoctrineMemcache; +use Doctrine\Common\Cache\MemcacheCache as DoctrineMemcache; /** * diff --git a/lib/classes/API/V1/result.php b/lib/classes/API/V1/result.php index e526e25b5b..066ca73f7e 100644 --- a/lib/classes/API/V1/result.php +++ b/lib/classes/API/V1/result.php @@ -10,6 +10,7 @@ */ use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\Request; /** * @@ -19,8 +20,6 @@ use Symfony\Component\HttpFoundation\Response; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -use \Symfony\Component\HttpFoundation\Request; - class API_V1_result { /** diff --git a/lib/classes/Bridge/Api/Dailymotion.php b/lib/classes/Bridge/Api/Dailymotion.php index 3b39934b07..9cbdd5ac40 100644 --- a/lib/classes/Bridge/Api/Dailymotion.php +++ b/lib/classes/Bridge/Api/Dailymotion.php @@ -11,7 +11,7 @@ require_once __DIR__ . "/../../../classes/DailymotionWithoutOauth2.php"; -use \Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Request; /** * @@ -194,7 +194,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I { return array(self::CONTAINER_TYPE_PLAYLIST => _('Playlists')); } - + public function get_oauth_token() { return $this->oauth_token; @@ -203,10 +203,10 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I public function set_oauth_token($oauth_token) { $this->oauth_token = $oauth_token; - + return $this; } - + /** * * @param string $type diff --git a/lib/classes/Bridge/Api/Youtube.php b/lib/classes/Bridge/Api/Youtube.php index 86338732ea..d599bf2d84 100644 --- a/lib/classes/Bridge/Api/Youtube.php +++ b/lib/classes/Bridge/Api/Youtube.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use \Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Request; /** * @@ -726,7 +726,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter if (false === $cxml = simplexml_load_file($url_cat)) { throw new Bridge_Exception_ApiConnectorRequestFailed('Failed to retrive youtube categories'); } - + $cxml->registerXPathNamespace('atom', 'http://www.w3.org/2005/Atom'); $categories = $cxml->xpath('//atom:category'); diff --git a/lib/classes/task/period/writemeta.php b/lib/classes/task/period/writemeta.php index 433734427b..121d1ac7db 100644 --- a/lib/classes/task/period/writemeta.php +++ b/lib/classes/task/period/writemeta.php @@ -43,23 +43,13 @@ class task_period_writemeta extends task_databoxAbstract { $request = http_request::getInstance(); - $parm2 = $request->get_parms( - 'period' - , 'cleardoc' - , 'maxrecs' - , 'maxmegs' - ); + $parm2 = $request->get_parms('period', 'cleardoc', 'maxrecs', 'maxmegs'); $dom = new DOMDocument(); $dom->preserveWhiteSpace = false; $dom->formatOutput = true; if ($dom->loadXML($oldxml)) { $xmlchanged = false; - foreach (array( - 'str:period' - , 'str:maxrecs' - , 'str:maxmegs' - , 'boo:cleardoc' - ) as $pname) { + foreach (array('str:period', 'str:maxrecs', 'str:maxmegs', 'boo:cleardoc') as $pname) { $ptype = substr($pname, 0, 3); $pname = substr($pname, 4); $pvalue = $parm2[$pname]; @@ -119,7 +109,7 @@ class task_period_writemeta extends task_databoxAbstract .maxmegs.value = "maxmegs, "js", '"') ?>"; dependencyContainer['exiftool.writer']->setModule(Writer::MODULE_MWG, true); - + $connbas = $databox->get_connection(); $subdefgroups = $databox->get_subdef_structure(); $metasubdefs = array();