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

Merge pull request #124 from Rojtjo/master

Browse Source 
Fixing service provider for 5.3
This commit is contained in:
Oliver Vogel
2014-04-16 16:59:51 +02:00
parent 517d9ba467 42be48323a
commit ec28ee2f72
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,8 @@ class ImageServiceProvider extends ServiceProvider
*/ */
public function register() public function register()
{ {
$this->app['image'] = $this->app->share( $app = $this->app;
$app['image'] = $app->share(
function ($app) { function ($app) {
return new Image; return new Image;
} }
@@ -41,8 +42,8 @@ class ImageServiceProvider extends ServiceProvider
if (class_exists('\Intervention\Image\ImageCache')) { if (class_exists('\Intervention\Image\ImageCache')) {
// load imagecache config // load imagecache config
$this->app['config']->package('intervention/imagecache', __DIR__.'/../../../../imagecache/src/config'); $app['config']->package('intervention/imagecache', __DIR__.'/../../../../imagecache/src/config');
$config = $this->app['config']->get('imagecache::imagecache'); $config = $app['config']->get('imagecache::imagecache');
// create dynamic manipulation route // create dynamic manipulation route
if (is_string($config['route'])) { if (is_string($config['route'])) {
@@ -51,7 +52,7 @@ class ImageServiceProvider extends ServiceProvider
$config['templates']['original'] = null; $config['templates']['original'] = null;
// setup image manipulator route // setup image manipulator route
$this->app['router']->get($config['route'].'/{template}/{filename}', array('as' => 'imagecache', function ($template, $filename) use ($config) { $app['router']->get($config['route'].'/{template}/{filename}', array('as' => 'imagecache', function ($template, $filename) use ($app, $config) {
// find file // find file
foreach ($config['paths'] as $path) { foreach ($config['paths'] as $path) {
@@ -65,7 +66,7 @@ class ImageServiceProvider extends ServiceProvider
// abort if file not found // abort if file not found
if ($image_path === false) { if ($image_path === false) {
$this->app->abort(404); $app->abort(404);
} }
// define template callback // define template callback
@@ -74,7 +75,7 @@ class ImageServiceProvider extends ServiceProvider
if (is_callable($callback)) { if (is_callable($callback)) {
// image manipulation based on callback // image manipulation based on callback
$content = $this->app['image']->cache(function ($image) use ($image_path, $callback) { $content = $app['image']->cache(function ($image) use ($image_path, $callback) {
return $callback($image->make($image_path)); return $callback($image->make($image_path));
}, $config['lifetime']); }, $config['lifetime']);