Revert "Merge pull request #449 from acseo/master"

This reverts commit 08f109c, reversing
changes made to 7541ae2.

DependencyInjection/APYDataGridExtension.php

@@ -28,7 +28,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
         $loader->load('columns.xml');
 
-        $container->setParameter('apy_data_grid.drivers', $config['drivers']);
         $container->setParameter('apy_data_grid.limits', $config['limits']);
         $container->setParameter('apy_data_grid.theme', $config['theme']);
         $container->setParameter('apy_data_grid.persistence', $config['persistence']);

DependencyInjection/Configuration.php

@@ -31,17 +31,6 @@ public function getConfigTreeBuilder()
                     ->defaultValue(array(20 => '20', 50 => '50', 100 => '100'))
                     ->prototype('scalar')->end()
                 ->end()
-                ->arrayNode("drivers")
-        		    /*->validate()
-        		        ->ifTrue(function($v) {
-        			    return !in_array($v, array("yml", "annotation"));
-        			})
-        			->thenInvalid("Some drivers are not known")
-        		    ->end()
-                     */
-                    ->defaultValue(array('annotation', 'yml'))
-                    ->prototype('scalar')->end()
-		        ->end()
                 ->booleanNode('persistence')->defaultFalse()->end()
                 ->scalarNode('theme')->defaultValue('APYDataGridBundle::blocks.html.twig')->end()
                 ->scalarNode('no_data_message')->defaultValue('No data')->end()

Grid/Export/DSVExport.php

@@ -55,6 +55,7 @@ public function computeData($grid)
         }
 
         fclose($outstream);
+
         $this->content = $content;
     }
 

Grid/Mapping/Driver/Annotation.php

@@ -79,9 +79,7 @@ protected function loadMetadataFromReader($className, $group = 'default')
         }
 
         if (empty($this->columns[$className][$group])) {
-            // Return empty array instead of array keys
-            $this->columns[$className][$group] = array();
-            //$this->columns[$className][$group] = array_keys($this->fields[$className][$group]);
+            $this->columns[$className][$group] = array_keys($this->fields[$className][$group]);
         } else {
             foreach ($this->columns[$className][$group] as $columnId) {
                 // Ignore mapped fields

Grid/Mapping/Metadata/Manager.php

@@ -21,11 +21,8 @@ class Manager
      */
     protected $drivers;
 
-    protected $container;
-
-    public function __construct($container)
+    public function __construct()
     {
-        $this->container = $container;
         $this->drivers = new DriverHeap();
     }
 
@@ -34,28 +31,6 @@ public function addDriver($driver, $priority)
         $this->drivers->insert($driver, $priority);
     }
 
-    /**
-     * Add drivers to the driver list
-     */
-    public function setDrivers($driverList)
-    {
-        $priority = 1;
-        foreach ($driverList as $driverName) {
-            switch ($driverName) {
-                case "annotation" :
-                    $driver = $this->container->get("grid.metadata.driver.annotation");
-                    break;
-                case "yml" :
-                    $driver = $this->container->get("grid.metadata.driver.yaml");
-                    break;
-                default :
-                    throw new \Exception("Driver $driverName not found");
-            }
-            $this->addDriver($driver, $priority);
-            $priority++;    
-        }
-    } 
-
     /**
      * @todo remove this hack
      * @return \APY\DataGridBundle\Grid\Mapping\Metadata\DriverHeap
@@ -94,10 +69,6 @@ public function getMetadata($className, $group = 'default')
             }
         }
 
-        if (empty($cols)) {
-            throw new \Exception(sprintf("No metadata information has been found for %s (group : %s)", $className, $group));
-        }
-
         $metadata->setFields($cols);
         $metadata->setFieldsMappings($mappings);
         $metadata->setGroupBy($groupBy);