update avanzu admin bundle to newest version #55 (#63)

app/AppKernel.php

@@ -37,7 +37,7 @@ class AppKernel extends Kernel
         // Bundles only used for development or unit and functional tests
         if (in_array($this->getEnvironment(), ['dev', 'test'])) {
             //$bundles[] = new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle();
-            //$bundles[] = new Symfony\Bundle\AsseticBundle\AsseticBundle();
+            $bundles[] = new Symfony\Bundle\AsseticBundle\AsseticBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();

app/Resources/AvanzuAdminThemeBundle/views/Partials/_head.html.twig

@@ -1,20 +1,12 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-{# Tell the browser to be responsive to screen width #}
 <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-{# Bootstrap 3.3.6 #}
 <link rel="stylesheet" href="{{ asset('theme/bootstrap/css/bootstrap.min.css') }}">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-{# Ionicons #}
 {#<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">#}
-<!-- Theme style -->
 <link rel="stylesheet" href="{{ asset('theme/dist/css/AdminLTE.min.css') }}">
-{# AdminLTE Skins. We have chosen the skin-blue for this starter page. However, you can choose
+<link rel="stylesheet" href="{{ asset("theme/dist/css/skins/" ~ avanzu_admin_context.skin|default('skin-blue-light') ~ ".min.css") }}">
-    any other skin. Make sure you apply the skin class to the body tag so the changes take effect. #}
-<link rel="stylesheet" href="{{ asset("theme/dist/css/skins/"~avanzu_admin_context.options.skin~".min.css") }}">
-{# HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries.
-    WARNING: Respond.js doesn't work if you view the page via file:// #}
 <!--[if lt IE 9]>
 <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
+<![endif]-->

app/config/config.yml

@@ -24,7 +24,7 @@ framework:
     # Supported values are 'textmate', 'macvim', 'emacs' and 'sublime' shortcuts
     # and any custom configuration string, such as: "phpstorm://open?file=%%f&line=%%l"
     # See http://symfony.com/doc/current/reference/configuration/framework.html#ide
-    ide: sublime
+    #ide: sublime
 
     # When using the HTTP Cache, ESI allows to render page fragments separately
     # and with different cache configurations for each fragment
@@ -92,13 +92,14 @@ doctrine:
 #    spool:     { type: memory }
 
 avanzu_admin_theme:
-    use_twig   : true
+    use_twig: true
-    theme:
+    use_assetic: true
-        default_avatar   : avatars/default.png
+    bower_bin: "/usr/local/bin/bower"
-        skin             : skin-blue
+    options:
-        fixed_layout     : false
+        default_avatar: avatars/default.png
-        boxed_layout     : false
+        skin: skin-green-light
+        fixed_layout: false
+        boxed_layout: false
         collapsed_sidebar: true
-        mini_sidebar     : true
+        mini_sidebar: true
-        # TODO support options like: language and skin via sidebar menu
+        control_sidebar: false
-        control_sidebar  : false

app/config/config_dev.yml

@@ -8,10 +8,6 @@ framework:
         strict_requirements: true
     profiler: { only_exceptions: false }
 
-#web_profiler:
-#    toolbar: '%kernel.debug%'
-#    intercept_redirects: false
-
 monolog:
     handlers:
         main:
@@ -42,9 +38,10 @@ services:
         tags:
             - name: twig.extension
 
-avanzu_admin_theme:
-    enable_demo: false
-
 web_profiler:
-    toolbar: true
+    toolbar: '%kernel.debug%'
     intercept_redirects: false
+
+# See routing_dev.yml
+#avanzu_admin_theme:
+#   enable_demo: false

composer.json

@@ -12,12 +12,6 @@
             "app/AppCache.php"
         ]
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/kevinpapst/AdminThemeBundle"
-        }
-    ],
     "require": {
         "php": ">=7.0.8",
         "ext-pdo_sqlite": "*",
@@ -39,8 +33,7 @@
         "white-october/pagerfanta-bundle": "^1.0",
         "beberlei/DoctrineExtensions": "^1.0",
         "symfony/web-server-bundle": "3.4",
-        "avanzu/admin-theme-bundle": "dev-feature/2.0",
+        "avanzu/admin-theme-bundle": "dev-master"
-        "almasaeed2010/adminlte": "~2.3.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "~3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "1353056aae6cd3e256368e770737274f",
+    "content-hash": "1108364ff698c0ff8298c5c660985cb6",
     "packages": [
         {
             "name": "almasaeed2010/adminlte",
@@ -48,24 +48,27 @@
         },
         {
             "name": "avanzu/admin-theme-bundle",
-            "version": "dev-feature/2.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/kevinpapst/AdminThemeBundle.git",
+                "url": "https://github.com/avanzu/AdminThemeBundle.git",
-                "reference": "a7b4a59ae178de1507a9090573b8bd70362518c9"
+                "reference": "eb80bd51fca844cabedae397c9c48c4529b06748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kevinpapst/AdminThemeBundle/zipball/a7b4a59ae178de1507a9090573b8bd70362518c9",
+                "url": "https://api.github.com/repos/avanzu/AdminThemeBundle/zipball/eb80bd51fca844cabedae397c9c48c4529b06748",
-                "reference": "a7b4a59ae178de1507a9090573b8bd70362518c9",
+                "reference": "eb80bd51fca844cabedae397c9c48c4529b06748",
                 "shasum": ""
             },
             "require": {
-                "almasaeed2010/adminlte": "^2.3",
+                "almasaeed2010/adminlte": "~2.3.0",
                 "php": ">=5.5.9",
+                "symfony/console": ">=2.3",
                 "symfony/event-dispatcher": ">=2.3",
                 "symfony/http-foundation": ">=2.3",
-                "symfony/http-kernel": ">=2.3"
+                "symfony/http-kernel": ">=2.3",
+                "symfony/options-resolver": ">=2.3",
+                "symfony/process": ">=2.3"
             },
             "require-dev": {
                 "phpspec/prophecy": "^1.6"
@@ -73,26 +76,32 @@
             "suggest": {
                 "knplabs/knp-menu-bundle": "Allows easy menu integration."
             },
-            "type": "library",
+            "type": "symfony-bundle",
             "autoload": {
                 "psr-4": {
                     "Avanzu\\AdminThemeBundle\\": ""
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
                     "name": "Marc Bach",
-                    "email": "mail@avanzu.de"
+                    "email": "mail@avanzu.de",
+                    "homepage": "http://www.avanzu.de",
+                    "role": "Original Author"
+                },
+                {
+                    "name": "Ángel Guzmán Maeso",
+                    "email": "shakaran@gmail.com",
+                    "homepage": "https://shakaran.net/blog",
+                    "role": "Developer Collaborator"
                 }
             ],
             "description": "Admin Theme based on the AdminLTE Template for easy integration into symfony",
-            "support": {
+            "time": "2017-12-29T18:13:35+00:00"
-                "source": "https://github.com/kevinpapst/AdminThemeBundle/tree/feature/2.0"
-            },
-            "time": "2017-09-17T10:50:56+00:00"
         },
         {
             "name": "beberlei/DoctrineExtensions",

src/AppBundle/Command/InstallCommand.php

@@ -59,9 +59,9 @@ class InstallCommand extends Command
             ];
         }
 
-        if ($this->installAssets($output, $io, 'assets:install', $arguments)) {
+        $this->installAssets($output, $io, 'avanzu:admin:initialize', $arguments);
-            $this->installAssets($output, $io, 'avanzu:admin:initialize', $arguments);
+        $this->installAssets($output, $io, 'assets:install', $arguments);
-        }
+        $this->installAssets($output, $io, 'avanzu:admin:fetch-vendor', []);
     }
 
     /**