Merge pull request #8 from daniel-de-wit/master

Replace and deprecate isFilled() with exists()
czim · Feb 14, 2018 · 9cbf5e8 · 9cbf5e8
2 parents 98a5cba + 7d5d730
commit 9cbf5e8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/src/Attachment/Attachment.php b/src/Attachment/Attachment.php
@@ -258,7 +258,7 @@ public function setToBeDeleted()
      */
     public function reprocess($variants = ['*'])
     {
-        if ( ! $this->isFilled()) {
+        if ( ! $this->exists()) {
             return;
         }
 
@@ -654,9 +654,21 @@ function ($variant) {
     /**
      * Returns whether this attachment actually has a file currently stored.
      *
+     * @deprecated Use exists() instead
+     * @see exists
      * @return bool
      */
     public function isFilled()
+    {
+        return $this->exists();
+    }
+
+    /**
+     * Returns whether this attachment actually has a file currently stored.
+     *
+     * @return bool
+     */
+    public function exists()
     {
         return ! empty($this->originalFilename());
     }

diff --git a/src/Contracts/AttachmentInterface.php b/src/Contracts/AttachmentInterface.php
@@ -116,10 +116,19 @@ public function variantPath($variant = null);
     /**
      * Returns whether this attachment actually has a file currently stored.
      *
+     * @deprecated Use exists() instead
+     * @see exists
      * @return bool
      */
     public function isFilled();
 
+    /**
+     * Returns whether this attachment actually has a file currently stored.
+     *
+     * @return bool
+     */
+    public function exists();
+
     /**
      * Returns the creation time of the file as originally assigned to this attachment's model.
      * Lives in the <attachment>_created_at attribute of the model.

diff --git a/tests/Attachment/AttachmentTest.php b/tests/Attachment/AttachmentTest.php
@@ -312,11 +312,11 @@ function it_returns_whether_the_attachment_is_filled()
         $attachment->setName('attachment');
         $attachment->setInstance($model);
 
-        static::assertFalse($attachment->isFilled());
+        static::assertFalse($attachment->exists());
 
         $model->attachment = 'testing';
 
-        static::assertTrue($attachment->isFilled());
+        static::assertTrue($attachment->exists());
     }
 
 

diff --git a/tests/Integration/PaperclipReprocessAttachmentTest.php b/tests/Integration/PaperclipReprocessAttachmentTest.php
@@ -19,7 +19,7 @@ function it_skips_reprocessing_a_variant_if_attachment_is_not_filled()
     {
         $model = $this->getTestModel();
 
-        static::assertFalse($model->image->isFilled());
+        static::assertFalse($model->image->exists());
 
         $model->image->reprocess();
     }
@@ -34,7 +34,7 @@ function it_reprocesses_variant()
         $model->image = new SplFileInfo($this->getTestFilePath('empty.gif'));
         $model->save();
 
-        static::assertTrue($model->image->isFilled());
+        static::assertTrue($model->image->exists());
         static::assertEquals('empty.gif', $model->image_file_name);
 
         $processedFilePath = $this->getUploadedAttachmentPath($model, 'empty.gif', 'image', 'medium');