Tweak version checks

barryvdh · barryvdh · commit 64a7a5e68c7e · 2014-11-24T22:34:36.000+01:00
Whoops, See barryvdh#229
diff --git a/src/LaravelDebugBar.php b/src/LaravelDebugBar.php
@@ -72,6 +72,7 @@ public function __construct($app = null)
             $app = app();   //Fallback when $app is not given
         }
         $this->app = $app;
+        $this->version = $app::VERSION;
     }
 
     /**
@@ -756,6 +757,6 @@ public function addMessage($message, $label = 'info')
      */
     protected function checkVersion($version, $operator = ">=")
     {
-    	return version_compare($this->app->version(), $version, $operator);
+    	return version_compare($this->version, $version, $operator);
     }
 }
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -74,8 +74,9 @@ function ($request, $response) use ($app) {
 
     protected function shouldUseMiddleware()
     {
-        $version = $this->app->version();
-        return !$this->app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');
+        $app = $this->app;
+        $version = $app::VERSION;
+        return !$app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public function __construct($app = null)`
`72`	`72`	`$app = app(); //Fallback when $app is not given`
`73`	`73`	`}`
`74`	`74`	`$this->app = $app;`
	`75`	`+ $this->version = $app::VERSION;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`/**`
`@@ -756,6 +757,6 @@ public function addMessage($message, $label = 'info')`
`756`	`757`	`*/`
`757`	`758`	`protected function checkVersion($version, $operator = ">=")`
`758`	`759`	`{`
`759`		`- return version_compare($this->app->version(), $version, $operator);`
	`760`	`+ return version_compare($this->version, $version, $operator);`
`760`	`761`	`}`
`761`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,9 @@ function ($request, $response) use ($app) {`
`74`	`74`
`75`	`75`	`protected function shouldUseMiddleware()`
`76`	`76`	`{`
`77`		`- $version = $this->app->version();`
`78`		`- return !$this->app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');`
	`77`	`+ $app = $this->app;`
	`78`	`+ $version = $app::VERSION;`
	`79`	`+ return !$app->runningInConsole() && version_compare($version, '4.1-dev', '>=') && version_compare($version, '5.0-dev', '<');`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`/**`