making test php 5.6 version compatible

Author: saqueib

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-imageup` will be documented in this file
 
+## 1.0.5 - 2018-11-03
+- Added support to upload non image file also
+- Can disable/enable auto upload dynamiclly by calling `$model->disableAutoUpload()` and enable it back `$model->enableAutoUpload()` 
+- Improved tests & Code cleanup
+
 ## 1.0.4 - 2018-11-01
 - Added support to customize filename and relative path dynamically
 

tests/ImageResizeTest.php

@@ -15,9 +15,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->user = new class extends User {
-            use HasImageUploads;
-        };
+        $this->user = new User();
 
         $this->assertTrue(file_exists($this->testImage), 'Test image file do not exists.');
     }

tests/ImageUpTest.php

@@ -25,16 +25,7 @@ public function setUp()
      */
     public function it_gets_image_field_options()
     {
-        $user = new class() extends User {
-            use HasImageUploads;
-
-            protected static $imageFields = ['avatar' => [
-                'width' => 200,
-                'height' => 200,
-                'crop' => true,
-                'folder' => 'avatar'
-            ]];
-        };
+        $user = new ImageFieldOptionsModel();
 
         $this->assertArraySubset([
             'width' => 200,
@@ -211,13 +202,11 @@ public function it_uploads_image_by_field_name()
      */
     public function it_gives_image_url_if_image_saved_in_db()
     {
-        $user = new class extends User {
-            use HasImageUploads;
+        $user = new User();
+        $user->setImagesField([
+            'avatar' => ['placeholder' => '/images/cover-placeholder.png']
+        ]);
 
-            public static $imageFields = [
-                'avatar' => ['placeholder' => '/images/cover-placeholder.png']
-            ];
-        };
         $user->forceFill([
             'name' => 'John',
             'email' => '[email protected]',
@@ -238,13 +227,11 @@ public function it_gives_image_url_if_image_saved_in_db()
      */
     public function it_gives_placeholder_image_url_if_file_has_no_image_and_placeholder_option_is_defined()
     {
-        $user = new class extends User {
-            use HasImageUploads;
+        $user = new User();
+        $user->setImagesField([
+            'cover' => ['placeholder' => '/images/cover-placeholder.png']
+        ]);
 
-            public static $imageFields = [
-                'cover' => ['placeholder' => '/images/cover-placeholder.png']
-            ];
-        };
         $user->forceFill([
             'name' => 'John',
             'email' => '[email protected]',
@@ -264,15 +251,12 @@ public function it_gives_placeholder_image_url_if_file_has_no_image_and_placehol
      */
     public function it_validate_the_uploaded_file_using_provided_rules()
     {
-        $user = new class extends User {
-            use HasImageUploads;
-
-            public static $imageFields = [
-                'avatar' => [
-                    'rules' => 'required|image'
-                ]
-            ];
-        };
+        $user = new User();
+        $user->setImagesField([
+            'avatar' => [
+                'rules' => 'required|image'
+            ]
+        ]);
 
         Storage::fake('public');
         $doc = UploadedFile::fake()->create('document.pdf');
@@ -687,18 +671,8 @@ public function it_triggers_after_save_hook_from_a_callback()
      */
     public function it_gives_correct_value_when_model_has_mutator_method()
     {
-        $user = new class extends User {
-            use HasImageUploads;
-
-            public static $imageFields = [
-                'avatar'
-            ];
+        $user = new ModelWithMutator();
 
-            public function getAvatarAttribute($value)
-            {
-                return $this->imageUrl('avatar');
-            }
-        };
         $user->forceFill([
             'name' => 'John',
             'email' => '[email protected]',
@@ -718,21 +692,13 @@ public function getAvatarAttribute($value)
      */
     public function it_gives_correct_value_using_path_specified_in_field_option_when_model_has_mutator_method()
     {
-        $user = new class extends User {
-            use HasImageUploads;
-
-            public static $imageFields = [
-                'avatar' => [
-                    'width' => 300,
-                    'path' => 'avatar'
-                ]
-            ];
-
-            public function getAvatarAttribute($value)
-            {
-                return $this->imageUrl('avatar');
-            }
-        };
+        $user = new ModelWithMutator();
+        $user->setImagesField([
+            'avatar' => [
+                'width' => 300,
+                'path' => 'avatar'
+            ]
+        ]);
 
         $user->forceFill([
             'name' => 'John',
@@ -795,3 +761,27 @@ protected function avatarUploadFilePath($file)
         return 'custome-avatar.jpg';
     }
 }
+
+class ImageFieldOptionsModel extends User {
+    use HasImageUploads;
+
+    protected static $imageFields = ['avatar' => [
+        'width' => 200,
+        'height' => 200,
+        'crop' => true,
+        'folder' => 'avatar'
+    ]];
+}
+
+class ModelWithMutator extends User {
+    use HasImageUploads;
+
+    public static $imageFields = [
+        'avatar'
+    ];
+
+    public function getAvatarAttribute($value)
+    {
+        return $this->imageUrl('avatar');
+    }
+}