Remove L5 support from 1.x

tieppt07 · Feb 4, 2015 · d510da0 · d510da0
1 parent 1b2307c
commit d510da0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.*|5.0.*",
+        "illuminate/support": "4.*",
         "symfony/finder": "~2.3",
         "maximebf/debugbar": "~1.10.2"
     },

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -18,7 +18,7 @@ public function boot()
     {
         $app = $this->app;
 
-        $this->registerConfiguration();
+        $app['config']->package('barryvdh/laravel-debugbar', __DIR__ . '/config');
 
         if ($app->runningInConsole()) {
             if ($this->app['config']->get('laravel-debugbar::config.capture_console') && method_exists($app, 'shutdown')) {
@@ -115,22 +115,7 @@ function ($app) {
             $this->app->middleware('Barryvdh\Debugbar\Middleware\Stack', array($this->app));
         }
     }
-
-    /**
-     * Register configuration files, with L5 fallback
-     */
-    protected function registerConfiguration()
-    {
-        // Is it possible to register the config?
-        if (method_exists($this->app['config'], 'package')) {
-            $this->app['config']->package('barryvdh/laravel-debugbar', __DIR__ . '/config');
-        } else {
-            // Load the config for now..
-            $config = $this->app['files']->getRequire(__DIR__ .'/config/config.php');
-            $this->app['config']->set('laravel-debugbar::config', $config);
-        }
-    }
-
+
     /**
      * Detect if the Middelware should be used.
      *