From 0234bdab8bf3659c559698ce0c9e2698160f6940 Mon Sep 17 00:00:00 2001 From: Ilya Sakovich Date: Thu, 3 Jan 2019 19:00:23 +0200 Subject: [PATCH 01/18] Update PHPDoc for media() method of HasMediaTrait (#1322) --- src/HasMedia/HasMediaTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasMedia/HasMediaTrait.php b/src/HasMedia/HasMediaTrait.php index 1f03ba269..da388f5d4 100644 --- a/src/HasMedia/HasMediaTrait.php +++ b/src/HasMedia/HasMediaTrait.php @@ -54,7 +54,7 @@ public static function bootHasMediaTrait() /** * Set the polymorphic relation. * - * @return mixed + * @return \Illuminate\Database\Eloquent\Relations\MorphMany */ public function media() { From bf2946f984a2bbf8a3e43819c8cf2833aa40054a Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Thu, 3 Jan 2019 17:03:27 +0000 Subject: [PATCH 02/18] Update a comment for addMediaFromBase64() (#1329) --- src/HasMedia/HasMediaTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasMedia/HasMediaTrait.php b/src/HasMedia/HasMediaTrait.php index da388f5d4..b9a6fa8b2 100644 --- a/src/HasMedia/HasMediaTrait.php +++ b/src/HasMedia/HasMediaTrait.php @@ -171,7 +171,7 @@ public function addMediaFromBase64(string $base64data, ...$allowedMimeTypes): Fi throw InvalidBase64Data::create(); } - // decoding and then reeconding should not change the data + // decoding and then reencoding should not change the data if (base64_encode(base64_decode($base64data)) !== $base64data) { throw InvalidBase64Data::create(); } From 80e6209f3ed1edeb6edbd9e4fd6d5a52aeab09c2 Mon Sep 17 00:00:00 2001 From: Nicolas Beauvais <2951704+nicolasbeauvais@users.noreply.github.com> Date: Thu, 3 Jan 2019 18:03:52 +0100 Subject: [PATCH 03/18] Fix install step failing on some shells (#1278) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 153058faa..5e5f4a107 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ For the creation of thumbnails of svg's or pdf's you should also install [Imagic You can install this package via composer using this command: ```bash -composer require spatie/laravel-medialibrary:^7.0.0 +composer require "spatie/laravel-medialibrary:^7.0.0" ``` The package will automatically register itself. From 12ffb96249e7c42d6b6ac7f45a40f30f392c7459 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Thu, 3 Jan 2019 15:04:19 -0200 Subject: [PATCH 04/18] Use combined assignment operator (#1274) --- tests/Feature/FileAdder/MediaConversions/AddMedia.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/FileAdder/MediaConversions/AddMedia.php b/tests/Feature/FileAdder/MediaConversions/AddMedia.php index 6658f25b8..8f8e4698a 100644 --- a/tests/Feature/FileAdder/MediaConversions/AddMedia.php +++ b/tests/Feature/FileAdder/MediaConversions/AddMedia.php @@ -105,7 +105,7 @@ public function it_will_not_create_a_derived_version_if_manipulations_did_not_ch Carbon::setTestNow(Carbon::now()->addMinute()); - $media->order_column = $media->order_column + 1; + $media->order_column += 1; $media->save(); $thumbsCreatedAt = filemtime($this->getMediaDirectory($media->id.'/conversions/test-thumb.jpg')); From 3f6b93047704beffbe473b762294834c74858a17 Mon Sep 17 00:00:00 2001 From: Mark Stralka Date: Thu, 3 Jan 2019 12:04:37 -0500 Subject: [PATCH 05/18] Update README.md (#1267) The Media class was moved to the Models subdirectory. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e5f4a107..0d1abc8fe 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ return [ /* * The class name of the media model that should be used. */ - 'media_model' => Spatie\MediaLibrary\Media::class, + 'media_model' => Spatie\MediaLibrary\Models\Media::class, /* * The engine that should perform the image conversions. From 1e26e49231f80de2f4c07173a0e26a62d61bc363 Mon Sep 17 00:00:00 2001 From: Robin Valk Date: Thu, 3 Jan 2019 18:08:06 +0100 Subject: [PATCH 06/18] Added support for absolute urls to use a responsive image sources (#1195) * Added domain support to allow for absolute responsive urls * Added setting for absolute urls for responsive img sources * Update comment * Inverted if statement in getResponsiveDomain method * Fixed tests * Always generate absolute urls * Updated tests and made them succeed --- src/UrlGenerator/LocalUrlGenerator.php | 2 +- tests/Feature/Media/ToHtmlTest.php | 2 +- .../Feature/ResponsiveImages/ResponsiveImageTest.php | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/UrlGenerator/LocalUrlGenerator.php b/src/UrlGenerator/LocalUrlGenerator.php index 3bb508921..0b42b6cb1 100644 --- a/src/UrlGenerator/LocalUrlGenerator.php +++ b/src/UrlGenerator/LocalUrlGenerator.php @@ -93,6 +93,6 @@ protected function makeCompatibleForNonUnixHosts(string $url): string */ public function getResponsiveImagesDirectoryUrl(): string { - return $this->getBaseMediaDirectoryUrl().'/'.$this->pathGenerator->getPathForResponsiveImages($this->media); + return url($this->getBaseMediaDirectoryUrl().'/'.$this->pathGenerator->getPathForResponsiveImages($this->media)).'/'; } } diff --git a/tests/Feature/Media/ToHtmlTest.php b/tests/Feature/Media/ToHtmlTest.php index 2b6e66c61..ac582c31a 100644 --- a/tests/Feature/Media/ToHtmlTest.php +++ b/tests/Feature/Media/ToHtmlTest.php @@ -118,6 +118,6 @@ public function it_will_not_rendering_extra_javascript_or_including_base64_svg_w $imgTag = $media->refresh()->img(); - $this->assertEquals('', $imgTag); + $this->assertEquals('', $imgTag); } } diff --git a/tests/Feature/ResponsiveImages/ResponsiveImageTest.php b/tests/Feature/ResponsiveImages/ResponsiveImageTest.php index eebe0bb2d..e7267cd68 100644 --- a/tests/Feature/ResponsiveImages/ResponsiveImageTest.php +++ b/tests/Feature/ResponsiveImages/ResponsiveImageTest.php @@ -17,13 +17,13 @@ public function a_media_instance_can_get_responsive_image_urls() $media = $this->testModelWithResponsiveImages->getFirstMedia(); $this->assertEquals([ - '/media/1/responsive-images/test___medialibrary_original_340_280.jpg', - '/media/1/responsive-images/test___medialibrary_original_284_233.jpg', - '/media/1/responsive-images/test___medialibrary_original_237_195.jpg', + 'http://localhost/media/1/responsive-images/test___medialibrary_original_340_280.jpg', + 'http://localhost/media/1/responsive-images/test___medialibrary_original_284_233.jpg', + 'http://localhost/media/1/responsive-images/test___medialibrary_original_237_195.jpg', ], $media->getResponsiveImageUrls()); $this->assertEquals([ - '/media/1/responsive-images/test___thumb_50_41.jpg', + 'http://localhost/media/1/responsive-images/test___thumb_50_41.jpg', ], $media->getResponsiveImageUrls('thumb')); $this->assertEquals([], $media->getResponsiveImageUrls('non-existing-conversion')); @@ -40,13 +40,13 @@ public function a_media_instance_can_generate_the_contents_of_scrset() $media = $this->testModelWithResponsiveImages->getFirstMedia(); $this->assertContains( - '/media/1/responsive-images/test___medialibrary_original_340_280.jpg 340w, /media/1/responsive-images/test___medialibrary_original_284_233.jpg 284w, /media/1/responsive-images/test___medialibrary_original_237_195.jpg 237w', + 'http://localhost/media/1/responsive-images/test___medialibrary_original_340_280.jpg 340w, http://localhost/media/1/responsive-images/test___medialibrary_original_284_233.jpg 284w, http://localhost/media/1/responsive-images/test___medialibrary_original_237_195.jpg 237w', $media->getSrcset() ); $this->assertContains('data:image/svg+xml;base64', $media->getSrcset()); $this->assertContains( - '/media/1/responsive-images/test___thumb_50_41.jpg 50w', + 'http://localhost/media/1/responsive-images/test___thumb_50_41.jpg 50w', $media->getSrcset('thumb') ); $this->assertContains('data:image/svg+xml;base64,', $media->getSrcset('thumb')); From 55e07545c56ce51667538f2cfa5c66831c350ff5 Mon Sep 17 00:00:00 2001 From: Goldfinch <2291826+Goldfinch@users.noreply.github.com> Date: Fri, 4 Jan 2019 06:09:30 +1300 Subject: [PATCH 07/18] add missing condition - should sort when creating (#1292) --- src/MediaObserver.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MediaObserver.php b/src/MediaObserver.php index 3f2cf9cbd..660324c2d 100644 --- a/src/MediaObserver.php +++ b/src/MediaObserver.php @@ -10,7 +10,9 @@ class MediaObserver { public function creating(Media $media) { - $media->setHighestOrderNumber(); + if ($media->shouldSortWhenCreating()) { + $media->setHighestOrderNumber(); + } } public function updating(Media $media) From e1d8fe917eff9b4440978516d93bde65df8c2fea Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 3 Jan 2019 18:10:42 +0100 Subject: [PATCH 08/18] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0533b573f..1f40ad409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to `laravel-medialibrary` will be documented in this file +## 7.5.3 - 2018-01-03 + +- use absolute urls for responsive image sources +- fix sortable + ## 7.5.2 - 2018-10-19 - fix for issue #1277 From 9f8ac8e128c80fd5a0ce470dec8b55027e8284fb Mon Sep 17 00:00:00 2001 From: Denitsa Mlechkova Date: Fri, 4 Jan 2019 11:35:39 +0100 Subject: [PATCH 09/18] Only set `custom_headers` property if explicitly set (#1351) --- src/FileAdder/FileAdder.php | 4 ++- tests/Feature/Media/CustomHeadersTest.php | 35 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tests/Feature/Media/CustomHeadersTest.php diff --git a/src/FileAdder/FileAdder.php b/src/FileAdder/FileAdder.php index b84f7431a..c2b546503 100644 --- a/src/FileAdder/FileAdder.php +++ b/src/FileAdder/FileAdder.php @@ -239,7 +239,9 @@ public function toMediaCollection(string $collectionName = 'default', string $di $media->manipulations = $this->manipulations; - $media->setCustomHeaders($this->customHeaders); + if (filled($this->customHeaders)) { + $media->setCustomHeaders($this->customHeaders); + } $media->fill($this->properties); diff --git a/tests/Feature/Media/CustomHeadersTest.php b/tests/Feature/Media/CustomHeadersTest.php new file mode 100644 index 000000000..3a7e459c0 --- /dev/null +++ b/tests/Feature/Media/CustomHeadersTest.php @@ -0,0 +1,35 @@ +testModel + ->addMedia($this->getTestJpg()) + ->toMediaCollection(); + + $this->assertFalse($media->hasCustomProperty('custom_headers')); + $this->assertEquals([], $media->getCustomHeaders()); + } + + /** @test */ + public function it_can_set_and_retrieve_custom_headers_when_explicitly_added() + { + $headers = [ + 'Header' => 'Present', + ]; + + $media = $this->testModel + ->addMedia($this->getTestJpg()) + ->toMediaCollection() + ->setCustomHeaders($headers); + + $this->assertTrue($media->hasCustomProperty('custom_headers')); + $this->assertEquals($headers, $media->getCustomHeaders()); + } +} From 62f51f87f27a9a78063c6d276f568f8f8223799b Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Fri, 4 Jan 2019 11:36:22 +0100 Subject: [PATCH 10/18] Update CHANGELOG.md --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f40ad409..1c7589136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ All notable changes to `laravel-medialibrary` will be documented in this file -## 7.5.3 - 2018-01-03 +## 7.5.4 - 2019-01-04 + +- only set `custom_headers` property if explicitly set + +## 7.5.3 - 2019-01-03 - use absolute urls for responsive image sources - fix sortable From 2a9f1353112e6d0f82755c42a7617709f7110505 Mon Sep 17 00:00:00 2001 From: Lars Janssen Date: Sat, 5 Jan 2019 15:06:04 +0100 Subject: [PATCH 11/18] Check if specified frame second exeeds video length (#1350) * Check if specified frame second exeeds video length * Fix styleci * Remove exception use 0 seconds instead * Remove exception --- src/ImageGenerators/FileTypes/Video.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ImageGenerators/FileTypes/Video.php b/src/ImageGenerators/FileTypes/Video.php index f8b189f4a..8cbeb2133 100644 --- a/src/ImageGenerators/FileTypes/Video.php +++ b/src/ImageGenerators/FileTypes/Video.php @@ -20,8 +20,10 @@ public function convert(string $file, Conversion $conversion = null): string ]); $video = $ffmpeg->open($file); + $duration = $ffmpeg->getDuration(); $seconds = $conversion ? $conversion->getExtractVideoFrameAtSecond() : 0; + $seconds = $duration < $seconds ? 0 : $seconds; $frame = $video->frame(TimeCode::fromSeconds($seconds)); $frame->save($imageFile); From a50e59d1eec7c2e161942ffd0d13860759e4760d Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Sat, 5 Jan 2019 15:06:46 +0100 Subject: [PATCH 12/18] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c7589136..33aac9bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-medialibrary` will be documented in this file +## 7.5.5 - 2019-01-05 + +- avoid exception when getting a video frame that does not exist + ## 7.5.4 - 2019-01-04 - only set `custom_headers` property if explicitly set From 22377b319da18f19e11abbb2d9c59dd7df470b91 Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 01:05:31 +0100 Subject: [PATCH 13/18] prepare for L5.8 --- .travis.yml | 2 +- composer.json | 18 +++++++++--------- .../CleanCommandTest/CleanConversionsTest.php | 2 +- tests/Feature/Commands/ClearCommandTest.php | 2 +- tests/Feature/Events/EventTest.php | 2 +- .../MediaConversions/DeleteMediaTest.php | 2 +- tests/Feature/FileSystem/FileSystemTest.php | 2 +- .../Feature/HasMediaTrait/DeleteMediaTest.php | 2 +- .../Feature/HasMediaTrait/UpdateMediaTest.php | 2 +- tests/Feature/Media/CustomPropertyTest.php | 2 +- tests/Feature/Media/ToHtmlTest.php | 6 +++--- tests/Feature/MediaStreamTest.php | 2 +- .../ResponsiveImages/ResponsiveImageTest.php | 8 ++++---- .../S3Integration/S3IntegrationTest.php | 4 ++-- tests/TestCase.php | 2 +- .../Conversion/ConversionCollectionTest.php | 2 +- tests/Unit/Conversion/ConversionTest.php | 2 +- tests/Unit/FileManipulatorTest.php | 2 +- .../PathGenerator/BasePathGeneratorTest.php | 2 +- .../Unit/UrlGenerator/BaseUrlGeneratorTest.php | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0854b5fc9..8dff3fa4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - sudo apt-get install -y ghostscript script: - - phpunit + - vendor/bin/phpunit branches: only: diff --git a/composer.json b/composer.json index ea85f18aa..e58ba6ef6 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,12 @@ } ], "require": { - "php": "^7.1", - "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0", - "illuminate/console": "~5.5.0|~5.6.0|~5.7.0", - "illuminate/database": "~5.5.0|~5.6.0|~5.7.0", - "illuminate/pipeline": "~5.5.0|~5.6.0|~5.7.0", - "illuminate/support": "~5.5.0|~5.6.0|~5.7.0", + "php": "^7.2", + "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/pipeline": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", "league/flysystem": "^1.0.8", "maennchen/zipstream-php": "~0.4", "spatie/image": "^1.4.0", @@ -40,9 +40,9 @@ "guzzlehttp/guzzle": "^6.3", "league/flysystem-aws-s3-v3": "^1.0.13", "mockery/mockery": "^1.0.0", - "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0", - "phpunit/phpunit" : "^7.0", - "spatie/phpunit-snapshot-assertions": "^1.2" + "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0|~3.8.0", + "phpunit/phpunit" : "^7.0|^8.0", + "spatie/phpunit-snapshot-assertions": "^2.0" }, "conflict": { "php-ffmpeg/php-ffmpeg": "<0.6.1" diff --git a/tests/Feature/Commands/CleanCommandTest/CleanConversionsTest.php b/tests/Feature/Commands/CleanCommandTest/CleanConversionsTest.php index 6aeae5028..a96408e4e 100644 --- a/tests/Feature/Commands/CleanCommandTest/CleanConversionsTest.php +++ b/tests/Feature/Commands/CleanCommandTest/CleanConversionsTest.php @@ -14,7 +14,7 @@ class CleanConversionsTest extends TestCase /** @var array */ protected $media; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/Commands/ClearCommandTest.php b/tests/Feature/Commands/ClearCommandTest.php index da4aa1eae..da9e366fd 100644 --- a/tests/Feature/Commands/ClearCommandTest.php +++ b/tests/Feature/Commands/ClearCommandTest.php @@ -11,7 +11,7 @@ class ClearCommandTest extends TestCase /** @var array */ protected $media; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/Events/EventTest.php b/tests/Feature/Events/EventTest.php index 1e50738d0..09d025b05 100644 --- a/tests/Feature/Events/EventTest.php +++ b/tests/Feature/Events/EventTest.php @@ -11,7 +11,7 @@ class EventTest extends TestCase { - public function setUp() + public function setUp(): void { parent::setup(); diff --git a/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php b/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php index 4e0bb5847..f3f806aec 100644 --- a/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php +++ b/tests/Feature/FileAdder/MediaConversions/DeleteMediaTest.php @@ -8,7 +8,7 @@ class DeleteMediaTest extends TestCase { - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/FileSystem/FileSystemTest.php b/tests/Feature/FileSystem/FileSystemTest.php index f530120a5..f087fb75d 100644 --- a/tests/Feature/FileSystem/FileSystemTest.php +++ b/tests/Feature/FileSystem/FileSystemTest.php @@ -12,7 +12,7 @@ class FileSystemTest extends TestCase */ protected $filesystem; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/HasMediaTrait/DeleteMediaTest.php b/tests/Feature/HasMediaTrait/DeleteMediaTest.php index ecb5b5115..4f5ddebd3 100644 --- a/tests/Feature/HasMediaTrait/DeleteMediaTest.php +++ b/tests/Feature/HasMediaTrait/DeleteMediaTest.php @@ -7,7 +7,7 @@ class DeleteMediaTest extends TestCase { - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/HasMediaTrait/UpdateMediaTest.php b/tests/Feature/HasMediaTrait/UpdateMediaTest.php index 22745b0db..91c465621 100644 --- a/tests/Feature/HasMediaTrait/UpdateMediaTest.php +++ b/tests/Feature/HasMediaTrait/UpdateMediaTest.php @@ -6,7 +6,7 @@ class UpdateMediaTest extends TestCase { - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/Media/CustomPropertyTest.php b/tests/Feature/Media/CustomPropertyTest.php index b22f75cda..3c7b8bfc2 100644 --- a/tests/Feature/Media/CustomPropertyTest.php +++ b/tests/Feature/Media/CustomPropertyTest.php @@ -12,7 +12,7 @@ class CustomPropertyTest extends TestCase /** @var \Spatie\MediaLibrary\Models\Media */ protected $mediaWithoutCustomProperty; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/Media/ToHtmlTest.php b/tests/Feature/Media/ToHtmlTest.php index ac582c31a..3efa4c1c1 100644 --- a/tests/Feature/Media/ToHtmlTest.php +++ b/tests/Feature/Media/ToHtmlTest.php @@ -10,7 +10,7 @@ class ToHtmlTest extends TestCase { use MatchesSnapshots; - public function setUp() + public function setUp(): void { parent::setUp(); @@ -102,8 +102,8 @@ public function it_can_render_itself_with_responsive_images_of_a_conversion_and_ $image = $media->refresh()->img('thumb'); - $this->assertContains('/media/2/responsive-images/', $image); - $this->assertContains('data:image/svg+xml;base64,', $image); + $this->assertStringContainsString('/media/2/responsive-images/', $image); + $this->assertStringContainsString('data:image/svg+xml;base64,', $image); } /** @test */ diff --git a/tests/Feature/MediaStreamTest.php b/tests/Feature/MediaStreamTest.php index 63242acc7..519483d02 100644 --- a/tests/Feature/MediaStreamTest.php +++ b/tests/Feature/MediaStreamTest.php @@ -12,7 +12,7 @@ class MediaStreamTest extends TestCase { - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/ResponsiveImages/ResponsiveImageTest.php b/tests/Feature/ResponsiveImages/ResponsiveImageTest.php index e7267cd68..b9bbe32cd 100644 --- a/tests/Feature/ResponsiveImages/ResponsiveImageTest.php +++ b/tests/Feature/ResponsiveImages/ResponsiveImageTest.php @@ -39,17 +39,17 @@ public function a_media_instance_can_generate_the_contents_of_scrset() $media = $this->testModelWithResponsiveImages->getFirstMedia(); - $this->assertContains( + $this->assertStringContainsString( 'http://localhost/media/1/responsive-images/test___medialibrary_original_340_280.jpg 340w, http://localhost/media/1/responsive-images/test___medialibrary_original_284_233.jpg 284w, http://localhost/media/1/responsive-images/test___medialibrary_original_237_195.jpg 237w', $media->getSrcset() ); - $this->assertContains('data:image/svg+xml;base64', $media->getSrcset()); + $this->assertStringContainsString('data:image/svg+xml;base64', $media->getSrcset()); - $this->assertContains( + $this->assertStringContainsString( 'http://localhost/media/1/responsive-images/test___thumb_50_41.jpg 50w', $media->getSrcset('thumb') ); - $this->assertContains('data:image/svg+xml;base64,', $media->getSrcset('thumb')); + $this->assertStringContainsString('data:image/svg+xml;base64,', $media->getSrcset('thumb')); } /** @test */ diff --git a/tests/Feature/S3Integration/S3IntegrationTest.php b/tests/Feature/S3Integration/S3IntegrationTest.php index 850847e68..9735ef1af 100644 --- a/tests/Feature/S3Integration/S3IntegrationTest.php +++ b/tests/Feature/S3Integration/S3IntegrationTest.php @@ -14,7 +14,7 @@ class S3IntegrationTest extends TestCase /** @var @string */ protected $s3BaseDirectory; - public function setUp() + public function setUp(): void { parent::setUp(); @@ -27,7 +27,7 @@ public function setUp() $this->app['config']->set('medialibrary.path_generator', S3TestPathGenerator::class); } - public function tearDown() + public function tearDown(): void { $this->cleanUpS3(); diff --git a/tests/TestCase.php b/tests/TestCase.php index 939501dbb..d9cd24225 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -35,7 +35,7 @@ abstract class TestCase extends Orchestra /** @var \Spatie\MediaLibrary\Tests\Support\TestModels\TestModelWithResponsiveImages */ protected $testModelWithResponsiveImages; - public function setUp() + public function setUp(): void { $this->loadEnvironmentVariables(); diff --git a/tests/Unit/Conversion/ConversionCollectionTest.php b/tests/Unit/Conversion/ConversionCollectionTest.php index 3af5b39e2..04c828c73 100644 --- a/tests/Unit/Conversion/ConversionCollectionTest.php +++ b/tests/Unit/Conversion/ConversionCollectionTest.php @@ -10,7 +10,7 @@ class ConversionCollectionTest extends TestCase /** @var \Spatie\MediaLibrary\Models\Media */ protected $media; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Conversion/ConversionTest.php b/tests/Unit/Conversion/ConversionTest.php index 41c8116fc..327bd3b2f 100644 --- a/tests/Unit/Conversion/ConversionTest.php +++ b/tests/Unit/Conversion/ConversionTest.php @@ -13,7 +13,7 @@ class ConversionTest extends TestCase /** @var \Spatie\MediaLibrary\Conversion\Conversion */ protected $conversion; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/FileManipulatorTest.php b/tests/Unit/FileManipulatorTest.php index 142125efa..2b025610b 100644 --- a/tests/Unit/FileManipulatorTest.php +++ b/tests/Unit/FileManipulatorTest.php @@ -13,7 +13,7 @@ class FileManipulatorTest extends TestCase /** @var \Spatie\MediaLibrary\Conversion\Conversion */ protected $conversion; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/PathGenerator/BasePathGeneratorTest.php b/tests/Unit/PathGenerator/BasePathGeneratorTest.php index ae667d7a7..a92f892dd 100644 --- a/tests/Unit/PathGenerator/BasePathGeneratorTest.php +++ b/tests/Unit/PathGenerator/BasePathGeneratorTest.php @@ -30,7 +30,7 @@ class BasePathGeneratorTest extends TestCase */ protected $pathGenerator; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/UrlGenerator/BaseUrlGeneratorTest.php b/tests/Unit/UrlGenerator/BaseUrlGeneratorTest.php index e14e722f7..5830f7f0f 100644 --- a/tests/Unit/UrlGenerator/BaseUrlGeneratorTest.php +++ b/tests/Unit/UrlGenerator/BaseUrlGeneratorTest.php @@ -36,7 +36,7 @@ class BaseUrlGeneratorTest extends TestCase */ protected $pathGenerator; - public function setUp() + public function setUp(): void { parent::setUp(); From f6d296e9b3d425609b36154ef2998e264dfb679a Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 01:06:23 +0100 Subject: [PATCH 14/18] edit changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33aac9bc9..1561a035c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-medialibrary` will be documented in this file +## 7.5.6 - 2019-02-19 + +- add support for Laravel 5.8 + ## 7.5.5 - 2019-01-05 - avoid exception when getting a video frame that does not exist From 3615fb33d8026d7a1dce4433228937b7a4b87b56 Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 01:34:53 +0100 Subject: [PATCH 15/18] wip --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8dff3fa4b..bfe958ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: required language: php php: - - 7.1 - 7.2 - 7.3 From bced3ce9ed69a1060fa978842c7fb5f87a5f7f67 Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 08:27:31 +0100 Subject: [PATCH 16/18] support 7.1 --- .travis.yml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfe958ce9..8dff3fa4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: required language: php php: + - 7.1 - 7.2 - 7.3 diff --git a/composer.json b/composer.json index e58ba6ef6..5bd45c72d 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.1", "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", From 98302e57465202d74a2fa783d156de3e4942fd01 Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 09:02:48 +0100 Subject: [PATCH 17/18] wip --- .travis.yml | 1 - CHANGELOG.md | 4 ++++ composer.json | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dff3fa4b..bfe958ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: required language: php php: - - 7.1 - 7.2 - 7.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1561a035c..1539d2470 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-medialibrary` will be documented in this file +## Unreleased + +- drop support for PHP 7.1 + ## 7.5.6 - 2019-02-19 - add support for Laravel 5.8 diff --git a/composer.json b/composer.json index 5bd45c72d..fa86145a7 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0", @@ -40,8 +40,8 @@ "guzzlehttp/guzzle": "^6.3", "league/flysystem-aws-s3-v3": "^1.0.13", "mockery/mockery": "^1.0.0", - "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0|~3.8.0", - "phpunit/phpunit" : "^7.0|^8.0", + "orchestra/testbench": "~3.8.0", + "phpunit/phpunit" : "^8.0", "spatie/phpunit-snapshot-assertions": "^2.0" }, "conflict": { From 6ffb8a41e60f024abd35ff47e08628354d6efd0e Mon Sep 17 00:00:00 2001 From: freek Date: Wed, 27 Feb 2019 10:31:55 +0100 Subject: [PATCH 18/18] drop support for PHP 7.1 --- CHANGELOG.md | 2 +- tests/Feature/S3Integration/S3IntegrationTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1539d2470..d9c756967 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to `laravel-medialibrary` will be documented in this file -## Unreleased +## 7.6.0 - 2019-02-27 - drop support for PHP 7.1 diff --git a/tests/Feature/S3Integration/S3IntegrationTest.php b/tests/Feature/S3Integration/S3IntegrationTest.php index 9735ef1af..4f2b6a869 100644 --- a/tests/Feature/S3Integration/S3IntegrationTest.php +++ b/tests/Feature/S3Integration/S3IntegrationTest.php @@ -127,7 +127,7 @@ public function it_retrieves_a_temporary_media_url_from_s3() ->preservingOriginal() ->toMediaCollection('default', 's3_disk'); - $this->assertContains( + $this->assertStringContainsString( "/{$this->s3BaseDirectory}/{$media->id}/test.jpg", $media->getTemporaryUrl(Carbon::now()->addMinutes(5)) ); @@ -157,7 +157,7 @@ public function it_retrieves_a_temporary_media_conversion_url_from_s3() ->addMedia($this->getTestJpg()) ->toMediaCollection('default', 's3_disk'); - $this->assertContains( + $this->assertStringContainsString( "/{$this->s3BaseDirectory}/{$media->id}/conversions/test-thumb.jpg", $media->getTemporaryUrl(Carbon::now()->addMinutes(5), 'thumb') );