fixes #44

src/BetterThumbsExtension.php

@@ -905,7 +905,7 @@ protected function registerBackendControllers()
 	{
 		$config = $this->getConfig();
 
-		if ( Version::compare('3.3.0', '>=')) {
+		if ( version_compare( Version::VERSION , '3.3.0', '>=' ) ) {
             return [
                 '/extensions/betterthumbs' => new BetterThumbsBackendController( $config ),
             ];

src/Controller/BetterThumbsBackendController.php

@@ -429,7 +429,7 @@ public function buildProperExtensionPath(Application $app )
         $urlGenerator = $app['url_generator'];
         $dashboardRoute = $urlGenerator->generate( 'dashboard' );
 
-        if (Version::compare('3.3.0', '>=')) {
+        if ( version_compare( Version::VERSION , '3.3.0', '>=' ) ) {
             $extensionsRoute = 'extensions';
         } else {
             $extensionsRoute = 'extend';
@@ -492,17 +492,7 @@ protected function listFileSystemPaths( $paths )
      */
     private function fsSetup( Application $app )
     {
-        // for bolt's new filesystem since $app['resources'] and getPath() are deprecated in 3.3+
-        // and will be removed in 4.0
 
-//        if (Version::compare( '3.3.0', '>=')) {
-//            $boltFilesPath =  $app['path_resolver']->resolve('files');
-//        } else {
-//            $boltFilesPath = $app['resources']->getPath( 'filespath' );
-//
-//        }
-
-//        $boltFilesPath = $this->boltFilesPath($app);
         $boltFilesPath = (new FilePathHelper( $app ) )->boltFilesPath() ;
 
         $adapter       = new Local( $boltFilesPath );

src/Helpers/FilePathHelper.php

@@ -21,7 +21,7 @@ class FilePathHelper
      * FilePathHelper constructor.
      * @param Application $app
      */
-    public function __construct(Application $app )
+    public function __construct(Application $app)
     {
         $this->app = $app;
     }
@@ -31,20 +31,14 @@ public function __construct(Application $app )
      * Get Bolt's Files path
      * @return mixed
      *
-     * The version is "reversed" from what you would logically use..
-     * instead of 'this version is greater than or equal too 3.3.0'
-     * we have to think ok the current bolt version is less than the one we are comparing
-     *
-     * example: bolt version 3.2.14 is less than 3.3.0 so
-     *  Version::compare( '3.3.0', '>=') would need to use resources not path_resolver
+     * Use PHP's version_compare instead of bolts Version::compare since it's "broken"
      */
     public function boltFilesPath()
     {
-        if (Version::compare( '3.3.0', '>=')) {
-            return $this->app['resources']->getPath( 'filespath' );
-        } else {
+        if (version_compare(Version::VERSION, '3.3.0', '>=')) {
             return $this->app['path_resolver']->resolve('files');
-
+        } else {
+            return $this->app['resources']->getPath('filespath');
         }
     }
 
@@ -54,10 +48,10 @@ public function boltFilesPath()
      */
     public function boltExtensionsPath()
     {
-        if (Version::compare( '3.3.0', '>=')) {
+        if (version_compare(Version::VERSION, '3.3.0', '>=')) {
             return $this->app['path_resolver']->resolve('extensions');
         } else {
-            return $this->app['resources']->getPath( 'extensions' );
+            return $this->app['resources']->getPath('extensions');
 
         }
     }