Tweak version checks

barryvdh · barryvdh · commit 60a9e4e80394 · 2014-11-24T21:55:35.000+01:00
diff --git a/src/LaravelDebugBar.php b/src/LaravelDebugBar.php
@@ -72,11 +72,6 @@ public function __construct($app = null)
             $app = app();   //Fallback when $app is not given
         }
         $this->app = $app;
-        
-        //Normalize Laravel version
-        $version = $app::VERSION;
-        list($version) = explode('-', $version);
-        $this->version = $version;
     }
 
     /**
@@ -133,7 +128,7 @@ function () use ($debugbar, $startTime) {
             );
 
             //Check if App::before is already called.. 
-            if ($this->checkVersion('4.1') && $this->app->isBooted()) {
+            if ($this->checkVersion('4.1-dev', '>=') && $this->app->isBooted()) {
                 $debugbar->startMeasure('application', 'Application');
             } else {
                 $this->app['router']->before(
@@ -160,7 +155,7 @@ function () use ($debugbar) {
                     $this->app['config']->get('laravel-debugbar::config.options.exceptions.chain', true)
                 );
                 $this->addCollector($exceptionCollector);
-                if ($this->checkVersion('5.0', '<')) {
+                if ($this->checkVersion('5.0-dev', '<')) {
 	                $this->app->error(
 	                    function (Exception $exception) use ($exceptionCollector) {
 	                        $exceptionCollector->addException($exception);
@@ -216,7 +211,7 @@ function ($view) use ($debugbar) {
 
         if ($this->shouldCollect('route')) {
             try {
-                if ($this->checkVersion('4.1')) {
+                if ($this->checkVersion('4.1', '>=')) {
                     $this->addCollector($this->app->make('Barryvdh\Debugbar\DataCollector\IlluminateRouteCollector'));
                 } else {
                     $this->addCollector($this->app->make('Barryvdh\Debugbar\DataCollector\SymfonyRouteCollector'));
@@ -761,6 +756,6 @@ public function addMessage($message, $label = 'info')
      */
     protected function checkVersion($version, $operator = ">=")
     {
-    	return version_compare($this->version, $version, $operator);
+    	return version_compare($this->app->version(), $version, $operator);
     }
 }
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -74,9 +74,8 @@ function ($request, $response) use ($app) {
 
     protected function shouldUseMiddleware()
     {
-        $app = $this->app;
-        list($version) = explode('-', $app::VERSION);
-        return !$app->runningInConsole() && version_compare($version, '4.1', '>=') && version_compare($version, '5.0', '<');
+        $version = $this->app->version();
+        return !$this->app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,8 @@ function ($request, $response) use ($app) {`
`74`	`74`
`75`	`75`	`protected function shouldUseMiddleware()`
`76`	`76`	`{`
`77`		`- $app = $this->app;`
`78`		`- list($version) = explode('-', $app::VERSION);`
`79`		`- return !$app->runningInConsole() && version_compare($version, '4.1', '>=') && version_compare($version, '5.0', '<');`
	`77`	`+ $version = $this->app->version();`
	`78`	`+ return !$this->app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`/**`