Register spl_autoloader sooner to work with Symfony3+

Remove invalid block call

Author: sescandell

AdmingeneratorGeneratorBundle.php

@@ -29,15 +29,7 @@ class AdmingeneratorGeneratorBundle extends Bundle
     public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;
-    }
-
-    /**
-     * (non-PHPdoc)
-     * @see \Symfony\Component\HttpKernel\Bundle\Bundle::boot()
-     */
-    public function boot()
-    {
-        $this->initAdmingeneratorClassLoader($this->container);
+        $this->initAdmingeneratorClassLoader($kernel->getCacheDir());
     }
 
     /**
@@ -46,8 +38,6 @@ public function boot()
      */
     public function build(ContainerBuilder $container)
     {
-        $this->initAdmingeneratorClassLoader($container);
-
         parent::build($container);
 
         $container->addCompilerPass(new ValidatorPass());
@@ -68,16 +58,18 @@ public function getContainerExtension()
     /**
      * Initialize Admingenerator Class loader
      *
-     * @param ContainerBuilder $container
+     * @param string $cacheDir
      */
-    private function initAdmingeneratorClassLoader(ContainerInterface $container)
+    private function initAdmingeneratorClassLoader($cacheDir)
     {
-        if (!$this->classLoaderInitialized) {
-            $this->classLoaderInitialized = true;
-
-            $admingeneratedClassLoader = new AdmingeneratedClassLoader();
-            $admingeneratedClassLoader->setBasePath($container->getParameter('kernel.cache_dir'));
-            $admingeneratedClassLoader->register();
+        if ($this->classLoaderInitialized) {
+            return;
         }
+
+        $this->classLoaderInitialized = true;
+
+        $admingeneratedClassLoader = new AdmingeneratedClassLoader();
+        $admingeneratedClassLoader->setBasePath($cacheDir);
+        $admingeneratedClassLoader->register();
     }
 }

Resources/templates/CommonAdmin/ListTemplate/thead.php.twig

@@ -37,9 +37,9 @@
     <th class="list-results-fields-header-column list-results-fields-header-column-{{ column.name|lower  }}{{ echo_if (column.isSortable) }} sorting{{ echo_if ("sortColumn == '" ~ column.sortOn ~ "' and sortOrder == 'ASC'") }}_asc{{ echo_elseif ("sortColumn == '" ~ column.sortOn ~ "' and sortOrder == 'DESC'") }}_desc{{ echo_endif () }}{{ echo_endif () }}">
         {% if column.isSortable -%}
             {{ echo_if ("sortColumn == '" ~ column.sortOn ~ "' and sortOrder == 'ASC'") }}
-                <a href="{{ echo_twig("path(listRoute, { 'sort': '" ~ column.sortOn ~ "', 'order_by': 'desc'})") }}" class="{{ block('sort_icon') }}">
+                <a href="{{ echo_twig("path(listRoute, { 'sort': '" ~ column.sortOn ~ "', 'order_by': 'desc'})") }}">
             {{ echo_else() }}
-                <a href="{{ echo_twig("path(listRoute, { 'sort': '" ~ column.sortOn ~ "', 'order_by': 'asc'})") }}" class="{{ block('sort_icon') }}">
+                <a href="{{ echo_twig("path(listRoute, { 'sort': '" ~ column.sortOn ~ "', 'order_by': 'asc'})") }}">
             {{ echo_endif () }}
         {%- endif -%}
         {{ echo_twig("'" ~ column.label|addslashes ~ "'|trans({}, '" ~ i18n_catalog|default("Admin") ~ "')") }}