mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-26 15:24:37 +02:00
Code Issues Releases Wiki Activity

Laravel 5 compatibility

Browse Source
This commit is contained in:
Oliver Vogel
2015-01-28 18:47:56 +01:00
parent a793ed501b
commit cfcc287f75
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Intervention/Image/ImageServiceProvider.php
View File

@@ -43,7 +43,7 @@ class ImageServiceProvider extends ServiceProvider
$app = $this->app;
$version = intval($app::VERSION);
$provider = sprintf(
'\Intervention\Image\Providers\Laravel%dServiceProvider', $version
'\Intervention\Image\ImageServiceProviderLaravel%d', $version
);
return new $provider($app);

3
src/Intervention/Image/Providers/Laravel4ServiceProvider.php → src/Intervention/Image/ImageServiceProviderLaravel4.php
View File

@@ -1,8 +1,7 @@
<?php
namespace Intervention\Image\Providers;
namespace Intervention\Image;
use Intervention\Image\ImageManager;
use Illuminate\Support\ServiceProvider;
use Illuminate\Http\Response as IlluminateResponse;

9
src/Intervention/Image/Providers/Laravel5ServiceProvider.php → src/Intervention/Image/ImageServiceProviderLaravel5.php
View File

@@ -1,8 +1,7 @@
<?php
namespace Intervention\Image\Providers;
namespace Intervention\Image;
use Intervention\Image\ImageManager;
use Illuminate\Support\ServiceProvider;
use Illuminate\Http\Response as IlluminateResponse;
@@ -26,7 +25,7 @@ class Laravel5ServiceProvider extends ServiceProvider
public function boot()
{
$this->publishes(array(
__DIR__.'/../../../config/config.php' => config_path('image.php')
__DIR__.'/../../config/config.php' => config_path('image.php')
));
// setup intervention/imagecache if package is installed
@@ -45,7 +44,7 @@ class Laravel5ServiceProvider extends ServiceProvider
// merge default config
$this->mergeConfigFrom(
'image',
__DIR__.'/../../../config/config.php'
__DIR__.'/../../config/config.php'
);
// create image
@@ -62,7 +61,7 @@ class Laravel5ServiceProvider extends ServiceProvider
private function bootstrapImageCache()
{
$app = $this->app;
$config = __DIR__.'/../../../../../imagecache/src/config/config.php';
$config = __DIR__.'/../../../../imagecache/src/config/config.php';
$this->publishes(array(
$config => config_path('imagecache.php')