Merge pull request #12 from michaeldyrynda/fix/#10-cascade-has-one-relationship

Add handling for hasOne relationships

Author: michaeldyrynda

src/CascadeSoftDeletes.php

@@ -2,6 +2,7 @@
 
 namespace Iatstuti\Database\Support;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use LogicException;
 
@@ -35,9 +36,13 @@ protected static function bootCascadeSoftDeletes()
 
             $delete = $model->forceDeleting ? 'forceDelete' : 'delete';
 
-            foreach ($model->getCascadingDeletes() as $relationship) {
-                foreach ($model->{$relationship} as $child) {
-                    $child->{$delete}();
+            foreach ($model->getActiveCascadingDeletes() as $relationship) {
+                if ($model->{$relationship} instanceof Model) {
+                    $model->{$relationship}->{$delete}();
+                } else {
+                    foreach ($model->{$relationship} as $child) {
+                        $child->{$delete}();
+                    }
                 }
             }
         });
@@ -80,4 +85,17 @@ protected function getCascadingDeletes()
     {
         return isset($this->cascadeDeletes) ? (array) $this->cascadeDeletes : [];
     }
+
+
+    /**
+     * For the cascading deletes defined on the model, return only those that are not null.
+     *
+     * @return array
+     */
+    protected function getActiveCascadingDeletes()
+    {
+        return array_filter($this->getCascadingDeletes(), function ($relationship) {
+            return ! is_null($this->{$relationship});
+        });
+    }
 }

tests/CascadeSoftDeletesIntegrationTest.php

@@ -1,18 +1,18 @@
 <?php
 
-use Illuminate\Database\Capsule\Manager;
-use Illuminate\Events\Dispatcher;
 use Illuminate\Container\Container;
+use Illuminate\Database\Capsule\Manager;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Events\Dispatcher;
 
 class CascadeSoftDeletesIntegrationTest extends PHPUnit_Framework_TestCase
 {
     public static function setupBeforeClass()
     {
         $manager = new Manager();
         $manager->addConnection([
-            'driver' => 'sqlite',
+            'driver'   => 'sqlite',
             'database' => ':memory:',
         ]);
 
@@ -43,6 +43,13 @@ public static function setupBeforeClass()
             $table->string('body');
             $table->timestamps();
         });
+
+        $manager->schema()->create('post_types', function ($table) {
+            $table->increments('id');
+            $table->integer('post_id')->unsigned()->nullable();
+            $table->string('label');
+            $table->timestamps();
+        });
     }
 
 
@@ -201,6 +208,22 @@ public function it_handles_grandchildren()
         }
     }
 
+    /** @test */
+    public function it_cascades_a_has_one_relationship()
+    {
+        $post = Tests\Entities\Post::create([
+            'title' => 'Cascade a has one relationship',
+            'body'  => 'This is how you cascade a has one relationship',
+        ]);
+
+        $type = new Tests\Entities\PostType(['label' => 'Test']);
+
+        $post->postType()->save($type);
+
+        $post->delete();
+        $this->assertCount(0, Tests\Entities\PostType::where('id', $type->id)->get());
+    }
+
     /**
      * Attach some dummy posts (w/ comments) to the given author.
      *
@@ -241,5 +264,4 @@ private function attachCommentsToPost($post)
 
         return $post;
     }
-
 }

tests/Entities/Post.php

@@ -12,12 +12,17 @@ class Post extends Model
 
     public $dates = ['deleted_at'];
 
-    protected $cascadeDeletes = ['comments'];
+    protected $cascadeDeletes = ['comments', 'postType'];
 
     protected $fillable = ['title', 'body'];
 
     public function comments()
     {
         return $this->hasMany('Tests\Entities\Comment');
     }
+
+    public function postType()
+    {
+        return $this->hasOne('Tests\Entities\PostType', 'post_id');
+    }
 }

tests/Entities/PostType.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Entities;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PostType extends Model
+{
+    protected $fillable = ['label'];
+
+    public function post()
+    {
+        return $this->belongsTo('Test\Entities\Post');
+    }
+}