Fix CS

lib/Alchemy/Phrasea/Application.php

@@ -133,7 +133,6 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGenerator;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -246,12 +245,12 @@ class Application extends SilexApplication
         $this->register(new ReCaptchaServiceProvider());
 
         $this['recaptcha.public-key'] = $this->share(function (Application $app) {
-            if($app['phraseanet.registry']->get('GV_captchas')) {
+            if ($app['phraseanet.registry']->get('GV_captchas')) {
                 return $app['phraseanet.registry']->get('GV_captcha_public_key');
             }
         });
         $this['recaptcha.private-key'] = $this->share(function (Application $app) {
-            if($app['phraseanet.registry']->get('GV_captchas')) {
+            if ($app['phraseanet.registry']->get('GV_captchas')) {
                 return $app['phraseanet.registry']->get('GV_captcha_private_key');
             }
         });

lib/Alchemy/Phrasea/Application/Api.php

@@ -12,8 +12,6 @@
 namespace Alchemy\Phrasea\Application;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
-use Alchemy\Phrasea\Authentication\Context;
-use Alchemy\Phrasea\Core\Event\PreAuthenticate;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Controller\Api\Oauth2;
 use Alchemy\Phrasea\Controller\Api\V1;
@@ -63,7 +61,6 @@ return call_user_func(function($environment = 'prod') {
     $app->mount('/api/oauthv2', new Oauth2());
     $app->mount('/api/v1', new V1());
 
-
     /**
      * Route Errors
      */

lib/Alchemy/Phrasea/Application/Root.php

@@ -123,7 +123,7 @@ return call_user_func(function($environment = null) {
         } elseif ($e instanceof \Exception_NotFound) {
             $code = 404;
             $message = 'Not Found';
-        } elseif($e instanceof \Exception_UnauthorizedAction) {
+        } elseif ($e instanceof \Exception_UnauthorizedAction) {
             $code = 403;
             $message = 'Forbidden';
         } else {

lib/Alchemy/Phrasea/Authentication/AccountCreator.php

@@ -51,14 +51,14 @@ class AccountCreator
     /**
      * Creates an account
      *
-     * @param Application $app The application
+     * @param Application $app       The application
-     * @param string $id    The base for user login
+     * @param string      $id        The base for user login
-     * @param string $email The email
+     * @param string      $email     The email
-     * @param array $templates Some extra templates to apply with the ones of this creator
+     * @param array       $templates Some extra templates to apply with the ones of this creator
      *
      * @return \User_Adapter
      *
-     * @throws RuntimeException In case the AccountCreator is disabled
+     * @throws RuntimeException         In case the AccountCreator is disabled
      * @throws InvalidArgumentException In case a user with the same email already exists
      */
     public function create(Application $app, $id, $email = null, array $templates = array())

lib/Alchemy/Phrasea/Authentication/Authenticator.php

@@ -54,7 +54,7 @@ class Authenticator
     /**
      * Open user session
      *
-     * @param  \User_Adapter $user
+     * @param \User_Adapter $user
      *
      * @return Session
      *

lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Authentication\Exception;;
+namespace Alchemy\Phrasea\Authentication\Exception;
 
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Symfony\Component\HttpFoundation\Response;

lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php

@@ -32,7 +32,7 @@ class Manager
      * Returns a Session give a cookie value
      *
      * @param string $cookieValue
-     * 
+     *
      * @return false|Session
      */
     public function getSession($cookieValue)

lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php

@@ -47,7 +47,7 @@ class FailureManager
     /**
      * Saves an authentication failure
      *
-     * @param string $username
+     * @param string  $username
      * @param Request $request
      *
      * @return FailureManager
@@ -70,7 +70,7 @@ class FailureManager
     /**
      * Checks a request for previous failures
      *
-     * @param string $username
+     * @param string  $username
      * @param Request $request
      *
      * @return FailureManager

lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordAuthenticationInterface.php

@@ -12,8 +12,8 @@ interface PasswordAuthenticationInterface
     /**
      * Validates credentials for a web based authentication
      *
-     * @param string $username
+     * @param string  $username
-     * @param string $password
+     * @param string  $password
      * @param Request $request
      *
      * @return integer|null

lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php

@@ -11,8 +11,6 @@
 
 namespace Alchemy\Phrasea\Authentication\Provider;
 
-use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Exception\RuntimeException;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;

lib/Alchemy/Phrasea/Authentication/Provider/Github.php

@@ -15,7 +15,6 @@ use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;
-use Alchemy\Phrasea\Exception\RuntimeException;
 use Guzzle\Http\Client as Guzzle;
 use Guzzle\Http\ClientInterface;
 use Guzzle\Common\Exception\GuzzleException;

lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php

@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Authentication\Provider;
 
-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;
@@ -230,7 +229,7 @@ class GooglePlus extends AbstractProvider
             throw new NotAuthenticatedException('Error while retrieving user info');
         }
 
-        try{
+        try {
             $plusData = $this->plus->people->get('me');
         } catch (\Google_Exception $e) {
             throw new NotAuthenticatedException('Error while retrieving user info', $e->getCode(), $e);

lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php

@@ -11,11 +11,9 @@
 
 namespace Alchemy\Phrasea\Authentication\Provider;
 
-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;
-use Alchemy\Phrasea\Exception\RuntimeException;
 use Guzzle\Http\Client as Guzzle;
 use Guzzle\Http\ClientInterface;
 use Guzzle\Common\Exception\GuzzleException;

lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php

@@ -60,7 +60,7 @@ interface ProviderInterface
      * successful or failure.
      *
      * @param Application $app
-     * @param Request $request
+     * @param Request     $request
      *
      * @throws NotAuthenticatedException In case the authentication failed.
      */
@@ -103,9 +103,9 @@ interface ProviderInterface
     /**
      * Creates a provider
      *
-     * @param UrlGenerator $generator
+     * @param UrlGenerator     $generator
      * @param SessionInterface $session
-     * @param array $options
+     * @param array            $options
      */
     public static function create(UrlGenerator $generator, SessionInterface $session, array $options);
 }

lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php

@@ -11,11 +11,9 @@
 
 namespace Alchemy\Phrasea\Authentication\Provider;
 
-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;
-use Alchemy\Phrasea\Exception\RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Generator\UrlGenerator;

lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php

@@ -25,7 +25,7 @@ class TokenValidator
     /**
      * Returns true if the token is valid
      *
-     * @param type $token
+     * @param  type    $token
      * @return boolean
      */
     public function isValid($token)

lib/Alchemy/Phrasea/Command/Setup/LessCompile.php

@@ -61,6 +61,7 @@ class LessCompile extends Command
 
         if (0 === $failures) {
             $output->writeln('<info>Build done !</info>');
+
             return 0;
         }
 

lib/Alchemy/Phrasea/Controller/Admin/Fields.php

@@ -124,7 +124,7 @@ class Fields implements ControllerProviderInterface
         return $app->json($fields);
     }
 
-    public  function getLanguage(Application $app, Request $request)
+    public function getLanguage(Application $app, Request $request)
     {
         return $app->json(array(
             'something_wrong'           => _('Something wrong happened, please try again or contact an admin.'),
@@ -220,7 +220,8 @@ class Fields implements ControllerProviderInterface
         return new Response($json, 200, array('Content-Type' => 'application/json'));
     }
 
-    public function createField(Application $app, Request $request, $sbas_id) {
+    public function createField(Application $app, Request $request, $sbas_id)
+    {
         $databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
         $data = $this->getFieldJsonFromRequest($app, $request);
 
@@ -243,7 +244,8 @@ class Fields implements ControllerProviderInterface
         ))));
     }
 
-    public function listFields(Application $app, $sbas_id) {
+    public function listFields(Application $app, $sbas_id)
+    {
         $databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
 
         return $app->json($databox->get_meta_structure()->toArray());
@@ -303,7 +305,7 @@ class Fields implements ControllerProviderInterface
         $data = $this->requestBodyToJson($request);
         $required = $this->getMandatoryFieldProperties();
 
-        foreach($data as $field) {
+        foreach ($data as $field) {
             foreach ($required as $key) {
                 if (false === array_key_exists($key, $field)) {
                     $app->abort(400, sprintf('The entity must contain a key `%s`', $key));
@@ -374,7 +376,7 @@ class Fields implements ControllerProviderInterface
     {
         try {
             \databox_field::loadClassFromTagName($field['tag']);
-        } catch(\Exception_Databox_metadataDescriptionNotFound $e) {
+        } catch (\Exception_Databox_metadataDescriptionNotFound $e) {
             throw new BadRequestHttpException(_(sprintf('Provided tag %s is unknown.', $field['tag'])));
         }
     }

lib/Alchemy/Phrasea/Controller/Api/Oauth2.php

@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Controller\Api;
 
 use Alchemy\Phrasea\Authentication\Context;
-use Alchemy\Phrasea\Application as PhraseaApplication;
 use Alchemy\Phrasea\Authentication\Exception\AccountLockedException;
 use Alchemy\Phrasea\Authentication\Exception\RequireCaptchaException;
 use Alchemy\Phrasea\Core\Event\PreAuthenticate;

lib/Alchemy/Phrasea/Controller/Permalink.php

@@ -77,10 +77,10 @@ class Permalink extends AbstractDelivery
                     }
                 }
                 $response = $that->deliverContent($app['request'], $record, $subdef, $watermark, $stamp, $app);
-                
+
                 $linkToCaption = $app->path("view_caption", array('sbas_id' => $sbas_id, 'record_id' => $record_id, 'token' => $token));
                 $response->headers->set('Link', $linkToCaption);
-                
+
                 return $response;
             } else {
                 $collection = \collection::get_from_base_id($app, $record->get_base_id());
@@ -99,29 +99,29 @@ class Permalink extends AbstractDelivery
             }
 
             $response = $that->deliverContent($app['request'], $record, $subdef, $watermark, $stamp, $app);
-            
+
             $linkToCaption = $app->path("view_caption", array('sbas_id' => $sbas_id, 'record_id' => $record_id, 'token' => $token));
             $response->headers->set('Link', $linkToCaption);
-            
+
             return $response;
         };
 
         $controllers->get('/v1/{sbas_id}/{record_id}/caption/', function(PhraseaApplication $app, Request $request, $sbas_id, $record_id) {
             $token = $request->query->get('token');
-            
+
             $databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
-            
+
             $record = \media_Permalink_Adapter::challenge_token($app, $databox, $token, $record_id, 'thumbnail');
             if (null === $record) {
                 throw new NotFoundHttpException("Caption not found");
             }
             $caption = $record->get_caption();
-            
+
             return new Response($caption->serialize(\caption_record::SERIALIZE_JSON), 200, array("Content-Type" => 'application/json'));
         })
         ->assert('sbas_id', '\d+')->assert('record_id', '\d+')
         ->bind('view_caption');
-        
+
         $controllers->get('/v1/{sbas_id}/{record_id}/{subdef}/', function (PhraseaApplication $app, Request $request, $sbas_id, $record_id, $subdef) use ($deliverPermaview) {
             $token = $request->query->get('token');
 

lib/Alchemy/Phrasea/Controller/Root/Login.php

@@ -879,8 +879,8 @@ class Login implements ControllerProviderInterface
 
     /**
      *
-     * @param PhraseaApplication $app
+     * @param  PhraseaApplication    $app
-     * @param string $providerId
+     * @param  string                $providerId
      * @return ProviderInterface
      * @throws NotFoundHttpException
      */

lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php

@@ -110,7 +110,7 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
 
         $app['auth.native'] = $app->share(function (Application $app) {
             $authConf = $app['phraseanet.configuration']->get('authentication');
-            
+
             if ($authConf['captcha']['enabled']) {
                 return new FailureHandledNativeAuthentication($app['auth.password-checker'], $app['auth.native.failure-manager']);
             } else {

lib/classes/ACL.php

@@ -1607,7 +1607,7 @@ class ACL implements cache_cacheableInterface
 
         $collections = array();
 
-        foreach($rs as $row) {
+        foreach ($rs as $row) {
             $collections[] = \collection::get_from_base_id($this->app, $row['base_id']);
         }
 

lib/classes/API/V1/Timer.php

@@ -25,7 +25,7 @@ class API_V1_Timer implements ServiceProviderInterface
         $callback = function (Event $event) use ($app) {
             $name = $event->getName();
             $n = 1;
-            while(isset($app['api.timers']->{$name})) {
+            while (isset($app['api.timers']->{$name})) {
                 $n++;
                 $name = $event->getName() . '#' . $n;
             }
@@ -50,4 +50,4 @@ class API_V1_Timer implements ServiceProviderInterface
     public function boot(Application $app)
     {
     }
-}
+}

lib/classes/Feed/Entry/Adapter.php

@@ -373,7 +373,7 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
      */
     public function get_publisher()
     {
-        if ( ! $this->publisher instanceof Feed_Publisher_Adapter) {
+        if (! $this->publisher instanceof Feed_Publisher_Adapter) {
             try {
                 $this->publisher = new Feed_Publisher_Adapter($this->app, $this->publisher_id);
             } catch (\Exception_Feed_PublisherNotFound $e) {

lib/classes/caption/record.php

@@ -87,12 +87,12 @@ class caption_record implements caption_interface, cache_cacheableInterface
 
         return $dumper->dump($this->toArray($includeBusinessFields), 3);
     }
-    
+
     protected function serializeJSON($includeBusinessFields)
     {
         return \p4string::jsonencode($this->toArray($includeBusinessFields));
     }
-    
+
     protected function toArray($includeBusinessFields)
     {
         $buffer = array();
@@ -112,6 +112,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
                 $buffer[$field->get_name()] = ctype_digit($val) ? (int) $val : $val;
             }
         }
+
         return array('record' => array('description' => $buffer));
     }
 

lib/classes/databox/descriptionStructure.php

@@ -147,4 +147,3 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
         return count($this->elements);
     }
 }
-

lib/classes/databox/field.php

@@ -872,9 +872,9 @@ class databox_field implements cache_cacheableInterface
     /**
      *
      * @param \Alchemy\Phrasea\Application $app
-     * @param databox $databox
+     * @param databox                      $databox
-     * @param type $name
+     * @param type                         $name
-     * @param type $multi
+     * @param type                         $multi
      *
      * @return databox_field
      *

lib/classes/patch/379.php

@@ -61,4 +61,3 @@ class patch_379 implements patchInterface
         return true;
     }
 }
-

lib/classes/patch/3805.php

@@ -79,4 +79,4 @@ class patch_3805 implements patchInterface
         $app['EM']->flush();
         $app['EM']->clear();
     }
-}
+}

lib/classes/patch/3806.php

@@ -74,4 +74,4 @@ class patch_3806 implements patchInterface
 
         $app['phraseanet.configuration']->setConfigurations($confs);
     }
-}
+}

lib/classes/patch/380a3.php

@@ -114,7 +114,6 @@ class patch_380a3 implements patchInterface
             $stmt->closeCursor();
             unset($stmt);
 
-
             $sql = "CALL explode_log_table(',')";
             $stmt = $conn->prepare($sql);
             $stmt->execute();
@@ -126,4 +125,4 @@ class patch_380a3 implements patchInterface
 
         return true;
     }
-}
+}

lib/classes/phrasea.php

@@ -10,8 +10,6 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Configuration;
-use Alchemy\Phrasea\Exception\RuntimeException;
 
 class phrasea
 {

lib/classes/random.php

@@ -233,8 +233,8 @@ class random
     /**
      * Get the validation token for one user and one validation basket
      *
-     * @param integer     $userId
+     * @param integer $userId
-     * @param integer     $basketId
+     * @param integer $basketId
      *
      * @return string The token
      *