diff --git a/src/Intervention/Image/ImageServiceProvider.php b/src/Intervention/Image/ImageServiceProvider.php index 6e84741b..c592e792 100644 --- a/src/Intervention/Image/ImageServiceProvider.php +++ b/src/Intervention/Image/ImageServiceProvider.php @@ -61,7 +61,9 @@ class ImageServiceProvider extends ServiceProvider */ private function getProvider() { - if (version_compare(Application::VERSION, '5.0', '<')) { + if (get_class($this->app) == 'Laravel\Lumen\Application') { + $provider = '\Intervention\Image\ImageServiceProviderLumen'; + } elseif (version_compare($this->app->version(), '5.0', '<')) { $provider = '\Intervention\Image\ImageServiceProviderLaravel4'; } else { $provider = '\Intervention\Image\ImageServiceProviderLaravel5'; diff --git a/src/Intervention/Image/ImageServiceProviderLumen.php b/src/Intervention/Image/ImageServiceProviderLumen.php index e9714bb1..0de36844 100644 --- a/src/Intervention/Image/ImageServiceProviderLumen.php +++ b/src/Intervention/Image/ImageServiceProviderLumen.php @@ -6,27 +6,6 @@ use Illuminate\Support\ServiceProvider; class ImageServiceProviderLumen extends ServiceProvider { - /** - * Determines if Intervention Imagecache is installed - * - * @return boolean - */ - private function cacheIsInstalled() - { - return class_exists('Intervention\\Image\\ImageCache'); - } - - /** - * Bootstrap the application events. - * - * @return void - */ - public function boot() - { - // setup intervention/imagecache if package is installed - $this->cacheIsInstalled() ? $this->bootstrapImageCache() : null; - } - /** * Register the service provider. * @@ -49,33 +28,4 @@ class ImageServiceProviderLumen extends ServiceProvider $app->alias('image', 'Intervention\Image\ImageManager'); } - - /** - * Bootstrap imagecache - * - * @return void - */ - private function bootstrapImageCache() - { - $app = $this->app; - $config = __DIR__.'/../../../../imagecache/src/config/config.php'; - - // merge default config - $this->mergeConfigFrom( - $config, - 'imagecache' - ); - - // imagecache route - if (is_string(config('imagecache.route'))) { - - $filename_pattern = '[ \w\\.\\/\\-]+'; - - // route to access template applied image file - $app['router']->get(config('imagecache.route').'/{template}/{filename}', array( - 'uses' => 'Intervention\Image\ImageCacheController@getResponse', - 'as' => 'imagecache' - ))->where(array('filename' => $filename_pattern)); - } - } }