Thomas Rabaix 13 years ago
parent
commit
15898fe0e4

+ 10 - 6
Builder/ShowBuilder.php

@@ -27,16 +27,17 @@ class ShowBuilder implements ShowBuilderInterface
 
     /**
      * @param \Sonata\AdminBundle\Guesser\TypeGuesserInterface $guesser
-     * @param array $templates
+     * @param array                                            $templates
      */
     public function __construct(TypeGuesserInterface $guesser, array $templates)
     {
-        $this->guesser = $guesser;
+        $this->guesser   = $guesser;
         $this->templates = $templates;
     }
 
     /**
      * @param array $options
+     *
      * @return \Sonata\AdminBundle\Admin\FieldDescriptionCollection
      */
     public function getBaseList(array $options = array())
@@ -46,9 +47,10 @@ class ShowBuilder implements ShowBuilderInterface
 
     /**
      * @param \Sonata\AdminBundle\Admin\FieldDescriptionCollection $list
-     * @param null $type
-     * @param \Sonata\AdminBundle\Admin\FieldDescriptionInterface $fieldDescription
-     * @param \Sonata\AdminBundle\Admin\AdminInterface $admin
+     * @param null                                                 $type
+     * @param \Sonata\AdminBundle\Admin\FieldDescriptionInterface  $fieldDescription
+     * @param \Sonata\AdminBundle\Admin\AdminInterface             $admin
+     *
      * @return mixed
      */
     public function addField(FieldDescriptionCollection $list, $type = null, FieldDescriptionInterface $fieldDescription, AdminInterface $admin)
@@ -68,6 +70,7 @@ class ShowBuilder implements ShowBuilderInterface
 
     /**
      * @param string $type
+     *
      * @return string
      */
     private function getTemplate($type)
@@ -82,8 +85,9 @@ class ShowBuilder implements ShowBuilderInterface
     /**
      * The method defines the correct default settings for the provided FieldDescription
      *
-     * @param \Sonata\AdminBundle\Admin\AdminInterface $admin
+     * @param \Sonata\AdminBundle\Admin\AdminInterface            $admin
      * @param \Sonata\AdminBundle\Admin\FieldDescriptionInterface $fieldDescription
+     *
      * @return void
      */
     public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInterface $fieldDescription)

+ 2 - 3
DependencyInjection/Compiler/AddAuditEntityCompilerPass.php

@@ -48,13 +48,12 @@ class AddAuditEntityCompilerPass implements CompilerPassInterface
         $autitedEntities = array_unique($autitedEntities);
 
         $container->setParameter('simplethings.entityaudit.audited_entities', $autitedEntities);
-        $container->getDefinition('sonata.admin.audit.manager')
-            ->addMethodCall('setReader', array('sonata.admin.audit.orm.reader', $autitedEntities));
+        $container->getDefinition('sonata.admin.audit.manager')->addMethodCall('setReader', array('sonata.admin.audit.orm.reader', $autitedEntities));
     }
 
     /**
      * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     * @param string $name
+     * @param string                                                  $name
      *
      * @return string
      */

+ 6 - 6
DependencyInjection/Compiler/AddGuesserCompilerPass.php

@@ -31,8 +31,8 @@ class AddGuesserCompilerPass implements CompilerPassInterface
 
         // ListBuilder
         $definition = $container->getDefinition('sonata.admin.guesser.orm_list_chain');
-        $services = array();
-        foreach($container->findTaggedServiceIds('sonata.admin.guesser.orm_list') as $id => $attributes) {
+        $services   = array();
+        foreach ($container->findTaggedServiceIds('sonata.admin.guesser.orm_list') as $id => $attributes) {
             $services[] = new Reference($id);
         }
 
@@ -40,8 +40,8 @@ class AddGuesserCompilerPass implements CompilerPassInterface
 
         // ListBuilder
         $definition = $container->getDefinition('sonata.admin.guesser.orm_datagrid_chain');
-        $services = array();
-        foreach($container->findTaggedServiceIds('sonata.admin.guesser.orm_datagrid') as $id => $attributes) {
+        $services   = array();
+        foreach ($container->findTaggedServiceIds('sonata.admin.guesser.orm_datagrid') as $id => $attributes) {
             $services[] = new Reference($id);
         }
 
@@ -49,8 +49,8 @@ class AddGuesserCompilerPass implements CompilerPassInterface
 
         // ShowBuilder
         $definition = $container->getDefinition('sonata.admin.guesser.orm_show_chain');
-        $services = array();
-        foreach($container->findTaggedServiceIds('sonata.admin.guesser.orm_show') as $id => $attributes) {
+        $services   = array();
+        foreach ($container->findTaggedServiceIds('sonata.admin.guesser.orm_show') as $id => $attributes) {
             $services[] = new Reference($id);
         }
 

+ 1 - 0
DependencyInjection/SonataDoctrineORMAdminExtension.php

@@ -65,6 +65,7 @@ class SonataDoctrineORMAdminExtension extends Extension
 
     /**
      * @param array $configs
+     *
      * @return array
      */
     private function fixTemplatesConfiguration(array $configs)

+ 1 - 0
Filter/ChoiceFilter.php

@@ -61,6 +61,7 @@ class ChoiceFilter extends Filter
 
     /**
      * @param string $type
+     *
      * @return bool
      */
     private function getOperator($type)

+ 2 - 1
Filter/Filter.php

@@ -58,13 +58,14 @@ abstract class Filter extends BaseFilter
 
     /**
      * @param \Sonata\AdminBundle\Datagrid\ProxyQueryInterface $queryBuilder
+     *
      * @return string
      */
     protected function getNewParameterName(ProxyQueryInterface $queryBuilder)
     {
         // dots are not accepted in a DQL identifier so replace them
         // by underscores.
-        return str_replace('.', '_', $this->getName()).'_'.$queryBuilder->getUniqueParameterId();
+        return str_replace('.', '_', $this->getName()) . '_' . $queryBuilder->getUniqueParameterId();
     }
 
     /**

+ 12 - 11
Model/ModelManager.php

@@ -54,9 +54,10 @@ class ModelManager implements ModelManagerInterface
      * Returns the model's metadata holding the fully qualified property, and the last
      * property name
      *
-     * @param string $baseClass The base class of the model holding the fully qualified property.
+     * @param string $baseClass        The base class of the model holding the fully qualified property.
      * @param string $propertyFullName The name of the fully qualified property (dot ('.') separated
-     * property string)
+     *                                 property string)
+     *
      * @return array(
      *     \Doctrine\ORM\Mapping\ClassMetadata $parentMetadata,
      *     string $lastPropertyName,
@@ -123,7 +124,7 @@ class ModelManager implements ModelManagerInterface
             $entityManager = $this->getEntityManager($object);
             $entityManager->persist($object);
             $entityManager->flush();
-        } catch ( \PDOException $e ) {
+        } catch (\PDOException $e) {
             throw new ModelManagerException('', 0, $e);
         }
     }
@@ -137,7 +138,7 @@ class ModelManager implements ModelManagerInterface
             $entityManager = $this->getEntityManager($object);
             $entityManager->persist($object);
             $entityManager->flush();
-        } catch ( \PDOException $e ) {
+        } catch (\PDOException $e) {
             throw new ModelManagerException('', 0, $e);
         }
     }
@@ -151,7 +152,7 @@ class ModelManager implements ModelManagerInterface
             $entityManager = $this->getEntityManager($object);
             $entityManager->remove($object);
             $entityManager->flush();
-        } catch ( \PDOException $e ) {
+        } catch (\PDOException $e) {
             throw new ModelManagerException('', 0, $e);
         }
     }
@@ -161,7 +162,7 @@ class ModelManager implements ModelManagerInterface
      */
     public function find($class, $id)
     {
-        if ( !isset($id) ) {
+        if (!isset($id)) {
             return null;
         }
 
@@ -233,7 +234,7 @@ class ModelManager implements ModelManagerInterface
     public function executeQuery($query)
     {
         if ($query instanceof QueryBuilder) {
-          return $query->getQuery()->execute();
+            return $query->getQuery()->execute();
         }
 
         return $query->execute();
@@ -335,7 +336,7 @@ class ModelManager implements ModelManagerInterface
 
             $entityManager->flush();
             $entityManager->clear();
-        } catch ( \PDOException $e ) {
+        } catch (\PDOException $e) {
             throw new ModelManagerException('', 0, $e);
         }
     }
@@ -348,7 +349,7 @@ class ModelManager implements ModelManagerInterface
         $datagrid->buildPager();
         $query = $datagrid->getQuery();
 
-        $query->select('DISTINCT '.$query->getRootAlias());
+        $query->select('DISTINCT ' . $query->getRootAlias());
         $query->setFirstResult($firstResult);
         $query->setMaxResults($maxResult);
 
@@ -387,8 +388,8 @@ class ModelManager implements ModelManagerInterface
                 $values['_sort_order'] = 'ASC';
             }
         } else {
-            $values['_sort_order']  = 'ASC';
-            $values['_sort_by']     = $fieldDescription->getName();
+            $values['_sort_order'] = 'ASC';
+            $values['_sort_by']    = $fieldDescription->getName();
         }
 
         return array('filter' => $values);

+ 1 - 1
Tests/Filter/QueryBuilder.php

@@ -21,7 +21,7 @@ class QueryBuilder
 
     /**
      * @param string $name
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function setParameter($name, $value)
     {