From f3da97d01d5d5369ea0704b7ddbac48dae2ab5e6 Mon Sep 17 00:00:00 2001 From: Adam Weston Date: Sun, 7 Jan 2024 09:48:16 -0500 Subject: [PATCH] Chore: upgrade glide --- composer.json | 2 +- composer.lock | 62 ++++-------------------------- src/Glide/DefaultServerFactory.php | 4 +- 3 files changed, 11 insertions(+), 57 deletions(-) diff --git a/composer.json b/composer.json index 4d32b450..d084dc70 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": "^8.1", "intervention/image": "^2.7", - "league/glide-laravel": "^1.0", + "league/glide-symfony": "^2.0", "spatie/laravel-package-tools": "^1.13.5" }, "require-dev": { diff --git a/composer.lock b/composer.lock index d31bc2f1..d506b0a3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9231d6b04b36c44fc2631bb99f0c01b8", + "content-hash": "d19f7ceb999017641f4714668dcb58b2", "packages": [ { "name": "brick/math", @@ -1645,69 +1645,23 @@ }, "time": "2023-07-08T06:26:07+00:00" }, - { - "name": "league/glide-laravel", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/glide-laravel.git", - "reference": "b525e33e32940f3b047d6ca357131aba0e973e72" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide-laravel/zipball/b525e33e32940f3b047d6ca357131aba0e973e72", - "reference": "b525e33e32940f3b047d6ca357131aba0e973e72", - "shasum": "" - }, - "require": { - "league/glide-symfony": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9", - "phpunit/phpunit": "^4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Glide\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Reinink", - "email": "jonathan@reinink.ca", - "homepage": "http://reinink.ca" - } - ], - "description": "Glide adapter for Laravel", - "homepage": "http://glide.thephpleague.com", - "support": { - "issues": "https://github.com/thephpleague/glide-laravel/issues", - "source": "https://github.com/thephpleague/glide-laravel/tree/master" - }, - "time": "2015-12-26T15:40:35+00:00" - }, { "name": "league/glide-symfony", - "version": "1.1.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/glide-symfony.git", - "reference": "8d0b117d5335699c374288a7cd6a041b7612e198" + "reference": "c88eaeb89b5ff964ded3c26f19080010d0118cd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide-symfony/zipball/8d0b117d5335699c374288a7cd6a041b7612e198", - "reference": "8d0b117d5335699c374288a7cd6a041b7612e198", + "url": "https://api.github.com/repos/thephpleague/glide-symfony/zipball/c88eaeb89b5ff964ded3c26f19080010d0118cd7", + "reference": "c88eaeb89b5ff964ded3c26f19080010d0118cd7", "shasum": "" }, "require": { "league/glide": "^2.0", - "symfony/http-foundation": "^2.3|^3.0|^4.0|^5.0|^6.0" + "symfony/http-foundation": "^2.3|^3.0|^4.0|^5.0|^6.0|^7.0" }, "require-dev": { "mockery/mockery": "^1.3.3", @@ -1734,9 +1688,9 @@ "homepage": "http://glide.thephpleague.com", "support": { "issues": "https://github.com/thephpleague/glide-symfony/issues", - "source": "https://github.com/thephpleague/glide-symfony/tree/1.1.0" + "source": "https://github.com/thephpleague/glide-symfony/tree/2.0.1" }, - "time": "2021-12-01T13:25:09+00:00" + "time": "2023-12-14T15:52:00+00:00" }, { "name": "league/mime-type-detection", diff --git a/src/Glide/DefaultServerFactory.php b/src/Glide/DefaultServerFactory.php index 2af8ac89..295e2e30 100644 --- a/src/Glide/DefaultServerFactory.php +++ b/src/Glide/DefaultServerFactory.php @@ -2,7 +2,7 @@ namespace Awcodes\Curator\Glide; -use League\Glide\Responses\LaravelResponseFactory; +use League\Glide\Responses\SymfonyResponseFactory; use League\Glide\Server; use League\Glide\ServerFactory; @@ -12,7 +12,7 @@ public function getFactory(): ServerFactory | Server { return ServerFactory::create([ 'driver' => 'gd', - 'response' => new LaravelResponseFactory(app('request')), + 'response' => new SymfonyResponseFactory(app('request')), 'source' => storage_path('app'), 'source_path_prefix' => 'public', 'cache' => storage_path('app'),