Merge pull request #381 from FriendsOfSymfony/CS

Fix CS

Author: GuilhemN

.gitignore

@@ -4,3 +4,4 @@ vendor/
 Propel/om/
 Propel/map/
 composer.lock
+.php_cs.cache

.php_cs

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the FOSOAuthServerBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\CS\Config\Config;
+use Symfony\CS\Finder\DefaultFinder;
+use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;
+use Symfony\CS\FixerInterface;
+
+$finder = DefaultFinder::create()
+    ->in(__DIR__)
+;
+
+$header = <<<EOF
+This file is part of the FOSOAuthServerBundle package.
+
+(c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOF;
+
+HeaderCommentFixer::setHeader($header);
+
+return Config::create()
+    ->level(FixerInterface::SYMFONY_LEVEL)
+    ->fixers(array('align_double_arrow', 'header_comment'))
+    ->finder($finder)
+    ->setUsingCache(true)
+;

Command/CleanCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the FOSOAuthServerBundle package.
  *
@@ -40,9 +41,9 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $services = array(
-            'fos_oauth_server.access_token_manager'     => 'Access token',
-            'fos_oauth_server.refresh_token_manager'    => 'Refresh token',
-            'fos_oauth_server.auth_code_manager'        => 'Auth code',
+            'fos_oauth_server.access_token_manager'  => 'Access token',
+            'fos_oauth_server.refresh_token_manager' => 'Refresh token',
+            'fos_oauth_server.auth_code_manager'     => 'Auth code',
         );
 
         foreach ($services as $service => $name) {

Controller/AuthorizeController.php

@@ -17,22 +17,21 @@
 use OAuth2\OAuth2ServerException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Controller handling basic authorization
+ * Controller handling basic authorization.
  *
  * @author Chris Jones <[email protected]>
  */
 class AuthorizeController implements ContainerAwareInterface
 {
     /**
-     * @var \FOS\OAuthServerBundle\Model\ClientInterface
+     * @var ClientInterface
      */
     private $client;
 
@@ -52,7 +51,7 @@ public function setContainer(ContainerInterface $container = null)
     }
 
     /**
-     * Authorize
+     * Authorize.
      */
     public function authorizeAction(Request $request)
     {
@@ -88,18 +87,18 @@ public function authorizeAction(Request $request)
         }
 
         return $this->container->get('templating')->renderResponse(
-            'FOSOAuthServerBundle:Authorize:authorize.html.' . $this->container->getParameter('fos_oauth_server.template.engine'),
+            'FOSOAuthServerBundle:Authorize:authorize.html.'.$this->container->getParameter('fos_oauth_server.template.engine'),
             array(
-                'form'      => $form->createView(),
-                'client'    => $this->getClient(),
+                'form'   => $form->createView(),
+                'client' => $this->getClient(),
             )
         );
     }
 
     /**
      * @param UserInterface        $user
      * @param AuthorizeFormHandler $formHandler
-     * @param Request $request
+     * @param Request              $request
      *
      * @return Response
      */
@@ -130,9 +129,10 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for
     }
 
     /**
-     * Generate the redirection url when the authorize is completed
+     * Generate the redirection url when the authorize is completed.
+     *
+     * @param UserInterface $user
      *
-     * @param  \FOS\OAuthServerBundle\Model\UserInterface $user
      * @return string
      */
     protected function getRedirectionUrl(UserInterface $user)
@@ -141,7 +141,7 @@ protected function getRedirectionUrl(UserInterface $user)
     }
 
     /**
-     * @return ClientInterface
+     * @return ClientInterface.
      */
     protected function getClient()
     {
@@ -170,10 +170,11 @@ protected function getClient()
         return $this->client;
     }
 
-    private function getCurrentRequest() {
-        if($this->container->has('request_stack')) {
+    private function getCurrentRequest()
+    {
+        if ($this->container->has('request_stack')) {
             $request = $this->container->get('request_stack')->getCurrentRequest();
-            if(null === $request) {
+            if (null === $request) {
                 throw new \RuntimeException('No current request.');
             }
 
@@ -185,7 +186,7 @@ private function getCurrentRequest() {
 
     private function getTokenStorage()
     {
-        if($this->container->has('security.token_storage')) {
+        if ($this->container->has('security.token_storage')) {
             return $this->container->get('security.token_storage');
         }
 

Controller/TokenController.php

@@ -32,7 +32,8 @@ public function __construct(OAuth2 $server)
     }
 
     /**
-     * @param  Request $request
+     * @param Request $request
+     *
      * @return Response
      */
     public function tokenAction(Request $request)

DependencyInjection/Compiler/GrantExtensionsCompilerPass.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the FOSOAuthServerBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\OAuthServerBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

DependencyInjection/Compiler/RequestStackCompilerPass.php

@@ -27,7 +27,7 @@ final class RequestStackCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if($container->has('request_stack')) {
+        if ($container->has('request_stack')) {
             return;
         }
 

DependencyInjection/Configuration.php

@@ -16,14 +16,14 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {
@@ -37,7 +37,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('db_driver')
                     ->validate()
                         ->ifNotInArray($supportedDrivers)
-                        ->thenInvalid('The driver %s is not supported. Please choose one of ' . json_encode($supportedDrivers))
+                        ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($supportedDrivers))
                     ->end()
                     ->isRequired()
                     ->cannotBeEmpty()

DependencyInjection/FOSOAuthServerExtension.php

@@ -22,11 +22,11 @@
 class FOSOAuthServerExtension extends Extension
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $processor     = new Processor();
+        $processor = new Processor();
         $configuration = new Configuration();
 
         $config = $processor->processConfiguration($configuration, $configs);
@@ -52,11 +52,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->remapParametersNamespaces($config, $container, array(
             '' => array(
-                'model_manager_name'    => 'fos_oauth_server.model_manager_name',
-                'client_class'          => 'fos_oauth_server.model.client.class',
-                'access_token_class'    => 'fos_oauth_server.model.access_token.class',
-                'refresh_token_class'   => 'fos_oauth_server.model.refresh_token.class',
-                'auth_code_class'       => 'fos_oauth_server.model.auth_code.class',
+                'model_manager_name'  => 'fos_oauth_server.model_manager_name',
+                'client_class'        => 'fos_oauth_server.model.client.class',
+                'access_token_class'  => 'fos_oauth_server.model.access_token.class',
+                'refresh_token_class' => 'fos_oauth_server.model.refresh_token.class',
+                'auth_code_class'     => 'fos_oauth_server.model.auth_code.class',
             ),
             'template' => 'fos_oauth_server.template.%s',
         ));

Document/AuthCodeManager.php

@@ -12,18 +12,19 @@
 namespace FOS\OAuthServerBundle\Document;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\DocumentRepository;
 use FOS\OAuthServerBundle\Model\AuthCodeInterface;
 use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
 
 class AuthCodeManager extends BaseAuthCodeManager
 {
     /**
-     * @var \Doctrine\ODM\MongoDB\DocumentManager
+     * @var DocumentManager
      */
     protected $dm;
 
     /**
-     * @var \Doctrine\ODM\MongoDB\DocumentRepository
+     * @var DocumentRepository
      */
     protected $repository;