Browse Source

reformat code + fix bug

Thomas 14 years ago
parent
commit
067d8b6c9f

+ 21 - 21
DependencyInjection/BaseApplicationExtension.php

@@ -29,10 +29,10 @@ use Symfony\Component\Finder\Finder;
 class BaseApplicationExtension extends Extension
 {
     protected $configNamespaces = array(
-      'templates' => array(
-        'layout',
-        'ajax'
-      )
+        'templates' => array(
+            'layout',
+            'ajax'
+        )
     );
     
     /**
@@ -81,29 +81,29 @@ class BaseApplicationExtension extends Extension
     
     protected function configLoadFiles($container)
     {
-      $loader = new XmlFileLoader($container, __DIR__ . '/../Resources/config');
-      
-      foreach ($this->configNamespaces as $ns => $params)
-      {
-        $loader->load(sprintf('%s.xml', $ns));
-      }
+        $loader = new XmlFileLoader($container, __DIR__ . '/../Resources/config');
+
+        foreach ($this->configNamespaces as $ns => $params) {
+            $loader->load(sprintf('%s.xml', $ns));
+        }
     }
     
     protected function configSetup($config, $container)
     {
-      foreach ($this->configNamespaces as $ns => $params)
-      {
-        if (isset($config[$ns]))
-        {
-          foreach ($config[$ns] as $type => $template)
-          {
-            if (isset($config[$ns][$type]))
-            {
-              $container->setParameter(sprintf('base_application.templates.%s', $type), $template);
+        foreach ($this->configNamespaces as $ns => $params) {
+
+            if (!isset($config[$ns])) {
+                continue;
+            }
+
+            foreach ($config[$ns] as $type => $template) {
+                if (!isset($config[$ns][$type])) {
+                    continue;
+                }
+
+                $container->setParameter(sprintf('base_application.templates.%s', $type), $template);
             }
-          }
         }
-      }
     }
 
     /**

+ 1 - 1
Filter/Filter.php

@@ -71,7 +71,7 @@ abstract class Filter extends Configurable
     {
         if($value) {
 
-            if($this->description['type'] == \Doctrine\ORM\Mapping\ClassMetadataInfo::MANY_TO_MANY) {
+            if($this->description->getType() == \Doctrine\ORM\Mapping\ClassMetadataInfo::MANY_TO_MANY) {
                 $queryBuilder->leftJoin(
                     sprintf('%s.%s', $queryBuilder->getRootAlias(), $this->description->getFieldName()),
                     $this->getName()

+ 1 - 1
Resources/doc/reference/routing.rst

@@ -22,7 +22,7 @@ represents the route prefix.
 
         protected $class = 'Application\Sonata\NewsBundle\Entity\Post';
 
-        protected $baseRoute = 'news_post_admin';
+        protected $baseRouteName = 'news_post_admin';
     }