From 1653b4605540b0c6e04d6f52f1fb23206c221b90 Mon Sep 17 00:00:00 2001 From: Jack Robertson Date: Fri, 21 Feb 2020 14:05:20 +0000 Subject: [PATCH] Apply fixes from StyleCI (#27) --- src/Facades/Conversion.php | 2 +- src/HasMedia.php | 4 ++-- src/ImageManipulator.php | 4 ++-- src/Jobs/PerformConversions.php | 8 ++++---- src/Models/Media.php | 4 ++-- tests/HasMediaTest.php | 10 +++++----- tests/ImageManipulatorTest.php | 10 +++++----- tests/MediaTest.php | 2 +- tests/MediaUploaderTest.php | 4 ++-- tests/Models/Subject.php | 2 +- .../2019_01_01_000000_create_media_table.php | 4 ++-- .../2019_01_01_000001_create_subjects_table.php | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Facades/Conversion.php b/src/Facades/Conversion.php index a586de9..2c846e8 100644 --- a/src/Facades/Conversion.php +++ b/src/Facades/Conversion.php @@ -2,8 +2,8 @@ namespace Optix\Media\Facades; -use Optix\Media\ConversionRegistry; use Illuminate\Support\Facades\Facade; +use Optix\Media\ConversionRegistry; class Conversion extends Facade { diff --git a/src/HasMedia.php b/src/HasMedia.php index a5f10e7..7e9d4b8 100644 --- a/src/HasMedia.php +++ b/src/HasMedia.php @@ -2,10 +2,10 @@ namespace Optix\Media; -use Optix\Media\Models\Media; -use Optix\Media\Jobs\PerformConversions; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Relations\MorphToMany; +use Optix\Media\Jobs\PerformConversions; +use Optix\Media\Models\Media; trait HasMedia { diff --git a/src/ImageManipulator.php b/src/ImageManipulator.php index a288de4..43795f0 100644 --- a/src/ImageManipulator.php +++ b/src/ImageManipulator.php @@ -2,10 +2,10 @@ namespace Optix\Media; -use Optix\Media\Models\Media; +use Illuminate\Contracts\Filesystem\FileNotFoundException; use Intervention\Image\ImageManager; use Optix\Media\Exceptions\InvalidConversion; -use Illuminate\Contracts\Filesystem\FileNotFoundException; +use Optix\Media\Models\Media; class ImageManipulator { diff --git a/src/Jobs/PerformConversions.php b/src/Jobs/PerformConversions.php index d82c8ec..ff49a30 100644 --- a/src/Jobs/PerformConversions.php +++ b/src/Jobs/PerformConversions.php @@ -3,12 +3,12 @@ namespace Optix\Media\Jobs; use Illuminate\Bus\Queueable; -use Optix\Media\Models\Media; -use Optix\Media\ImageManipulator; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; +use Optix\Media\ImageManipulator; +use Optix\Media\Models\Media; class PerformConversions implements ShouldQueue { diff --git a/src/Models/Media.php b/src/Models/Media.php index bd9b2d7..eb9f312 100644 --- a/src/Models/Media.php +++ b/src/Models/Media.php @@ -2,10 +2,10 @@ namespace Optix\Media\Models; -use Illuminate\Support\Str; +use Illuminate\Contracts\Filesystem\Filesystem; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; -use Illuminate\Contracts\Filesystem\Filesystem; +use Illuminate\Support\Str; class Media extends Model { diff --git a/tests/HasMediaTest.php b/tests/HasMediaTest.php index 9f14067..2c02393 100644 --- a/tests/HasMediaTest.php +++ b/tests/HasMediaTest.php @@ -2,13 +2,13 @@ namespace Optix\Media\Tests; -use Optix\Media\Models\Media; +use Illuminate\Database\Eloquent\Collection as EloquentCollection; +use Illuminate\Database\Eloquent\Relations\MorphToMany; +use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Queue; -use Optix\Media\Tests\Models\Subject; use Optix\Media\Jobs\PerformConversions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Database\Eloquent\Relations\MorphToMany; -use Illuminate\Database\Eloquent\Collection as EloquentCollection; +use Optix\Media\Models\Media; +use Optix\Media\Tests\Models\Subject; class HasMediaTest extends TestCase { diff --git a/tests/ImageManipulatorTest.php b/tests/ImageManipulatorTest.php index 8d15c5a..a7e1eeb 100644 --- a/tests/ImageManipulatorTest.php +++ b/tests/ImageManipulatorTest.php @@ -2,14 +2,14 @@ namespace Optix\Media\Tests; -use Mockery; +use Illuminate\Filesystem\Filesystem; use Intervention\Image\Image; -use Optix\Media\Models\Media; -use Optix\Media\ImageManipulator; -use Optix\Media\ConversionRegistry; use Intervention\Image\ImageManager; -use Illuminate\Filesystem\Filesystem; +use Mockery; +use Optix\Media\ConversionRegistry; use Optix\Media\Exceptions\InvalidConversion; +use Optix\Media\ImageManipulator; +use Optix\Media\Models\Media; class ImageManipulatorTest extends TestCase { diff --git a/tests/MediaTest.php b/tests/MediaTest.php index ac1f1e3..4af13a7 100644 --- a/tests/MediaTest.php +++ b/tests/MediaTest.php @@ -2,9 +2,9 @@ namespace Optix\Media\Tests; +use Illuminate\Filesystem\Filesystem; use Mockery; use Optix\Media\Models\Media; -use Illuminate\Filesystem\Filesystem; class MediaTest extends TestCase { diff --git a/tests/MediaUploaderTest.php b/tests/MediaUploaderTest.php index cd2d797..2cad012 100644 --- a/tests/MediaUploaderTest.php +++ b/tests/MediaUploaderTest.php @@ -2,9 +2,9 @@ namespace Optix\Media\Tests; -use Optix\Media\Models\Media; -use Optix\Media\MediaUploader; use Illuminate\Http\UploadedFile; +use Optix\Media\MediaUploader; +use Optix\Media\Models\Media; use Optix\Media\Tests\Models\Media as CustomMedia; class MediaUploaderTest extends TestCase diff --git a/tests/Models/Subject.php b/tests/Models/Subject.php index 6e7ef44..6a8a868 100644 --- a/tests/Models/Subject.php +++ b/tests/Models/Subject.php @@ -2,8 +2,8 @@ namespace Optix\Media\Tests\Models; -use Optix\Media\HasMedia; use Illuminate\Database\Eloquent\Model; +use Optix\Media\HasMedia; class Subject extends Model { diff --git a/tests/database/migrations/2019_01_01_000000_create_media_table.php b/tests/database/migrations/2019_01_01_000000_create_media_table.php index 03204b6..3e958c2 100644 --- a/tests/database/migrations/2019_01_01_000000_create_media_table.php +++ b/tests/database/migrations/2019_01_01_000000_create_media_table.php @@ -1,8 +1,8 @@