Browse Source

Fix some CS

Thomas Rabaix 13 years ago
parent
commit
2277812a51

+ 11 - 10
Controller/CRUDController.php

@@ -124,9 +124,9 @@ class CRUDController extends Controller
     }
 
     /**
-     * @param string                                          $view
-     * @param array                                           $parameters
-     * @param null|\Symfony\Component\HttpFoundation\Response $response
+     * @param string   $view
+     * @param array    $parameters
+     * @param Response $response
      *
      * @return Response
      */
@@ -233,7 +233,7 @@ class CRUDController extends Controller
      *
      * @param mixed $id
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function editAction($id = null)
     {
@@ -292,7 +292,7 @@ class CRUDController extends Controller
      *
      * @param object $object
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function redirectTo($object)
     {
@@ -317,7 +317,7 @@ class CRUDController extends Controller
      * return the Response object associated to the batch action
      *
      * @throws \RuntimeException
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function batchAction()
     {
@@ -405,7 +405,7 @@ class CRUDController extends Controller
     /**
      * return the Response object associated to the create action
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function createAction()
     {
@@ -455,7 +455,7 @@ class CRUDController extends Controller
     /**
      * return the Response object associated to the view action
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     public function showAction($id = null)
     {
@@ -563,8 +563,9 @@ class CRUDController extends Controller
     }
 
     /**
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @param Request $request
+     *
+     * @return Response
      */
     public function exportAction(Request $request)
     {

+ 5 - 2
Form/Type/AdminType.php

@@ -27,7 +27,7 @@ class AdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $admin = $this->getAdmin($options);
-        
+
         if ($options['delete'] && $admin->isGranted('DELETE') ) {
             $builder->add('_delete', 'checkbox', array('required' => false, 'property_path' => false));
         }
@@ -40,7 +40,10 @@ class AdminType extends AbstractType
 
         $builder->prependClientTransformer(new ArrayToModelTransformer($admin->getModelManager(), $admin->getClass()));
     }
-    
+
+    /**
+     * {@inheritDoc}
+     */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array('delete' => true));

+ 4 - 1
Form/Type/BooleanType.php

@@ -32,10 +32,13 @@ class BooleanType extends FormChoiceType
         $this->translator = $translator;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         parent::setDefaultOptions($resolver);
-        
+
         $resolver->setDefaults(array(
             'choices' => array(
                 self::TYPE_YES  => $this->translator->trans('label_type_yes', array(), 'SonataAdminBundle'),

+ 3 - 0
Form/Type/CollectionType.php

@@ -36,6 +36,9 @@ class CollectionType extends AbstractType
         $builder->addEventSubscriber($listener);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(

+ 6 - 3
Form/Type/ModelReferenceType.php

@@ -37,16 +37,19 @@ class ModelReferenceType extends AbstractType
         $builder->prependClientTransformer(new ModelToIdTransformer($options['model_manager'], $options['class']));
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $compound = function (Options $options) {
             return isset($options['parent']) ? $options['parent'] : 'hidden';
         };
-        
+
         $resolver->setDefaults(array(
-            'compound' => $compound,
+            'compound'      => $compound,
             'model_manager' => null,
-            'class' => null
+            'class'         => null
         ));
     }
 

+ 6 - 3
Form/Type/TranslatableChoiceType.php

@@ -45,25 +45,28 @@ class TranslatableChoiceType extends ChoiceType
             'choices'           => array(),
             'preferred_choices' => array(),
             'catalogue'         => 'messages',
-            
+
             'empty_data'        => function (Options $options, $previousValue) {
                 $multiple = isset($options['multiple']) && $options['multiple'];
                 $expanded = isset($options['expanded']) && $options['expanded'];
 
                 return $multiple || $expanded ? array() : '';
             },
-                    
+
             'empty_value'       => function (Options $options, $previousValue) {
                 $multiple = isset($options['multiple']) && $options['multiple'];
                 $expanded = isset($options['expanded']) && $options['expanded'];
 
                 return $multiple || $expanded || !isset($options['empty_value']) ? null : '';
             },
-                    
+
             'error_bubbling'    => false,
         ));
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // translate options before building form

+ 1 - 1
Model/ModelManagerInterface.php

@@ -135,7 +135,7 @@ interface ModelManagerInterface
     /**
      * @param string $class
      *
-     * @return void
+     * @return array
      */
     function getModelCollectionInstance($class);