Merge branch 'develop' into 3.x

src/Database/Models/Revision.php

@@ -20,6 +20,10 @@ class Revision extends Model
      */
     public function getNewValueAttribute($value)
     {
+        if ($value === null) {
+            return null;
+        }
+
         if ($this->cast === 'date') {
             return $this->asDateTime($value);
         }
@@ -32,6 +36,10 @@ public function getNewValueAttribute($value)
      */
     public function getOldValueAttribute($value)
     {
+        if ($value === null) {
+            return null;
+        }
+
         if ($this->cast === 'date') {
             return $this->asDateTime($value);
         }

src/Database/Relations/HasMany.php

@@ -69,13 +69,6 @@ public function setSimpleValue($value)
         $this->parent->setRelation($this->relationName, $collection);
 
         $this->parent->bindEventOnce('model.afterSave', function() use ($collection) {
-            // Relation is already set, do nothing. This prevents the relationship
-            // from being nulled below and left unset because the save will ignore
-            // attribute values that are numerically equivalent (not dirty).
-            $collection = $collection->reject(function ($instance) {
-                return $instance->getOriginal($this->getForeignKeyName()) == $this->getParentKey();
-            });
-
             $existingIds = $collection->pluck($this->localKey)->all();
             $this->whereNotIn($this->localKey, $existingIds)
                 ->update([$this->getForeignKeyName() => null]);

src/Scaffold/Console/plugin/plugin.stub

@@ -36,7 +36,7 @@ class Plugin extends PluginBase
     /**
      * Boot method, called right before the request route.
      *
-     * @return array
+     * @return void
      */
     public function boot()
     {

tests/Assetic/StylesheetMinifyTest.php

@@ -46,6 +46,23 @@ public function testEmptyClassPreserve()
         $this->assertEquals($output, $mockAsset->getContent());
     }
 
+    public function testEmptyCommentPreserve()
+    {
+        $input = ''.
+        '
+        body { background: blue; }
+        /**/
+        .view { color: red; }';
+
+        $output = 'body{background:blue}/**/.view{color:red}';
+
+        $mockAsset = new MockAsset($input);
+        $result    = new StylesheetMinify();
+        $result->filterDump($mockAsset);
+
+        $this->assertEquals($output, $mockAsset->getContent());
+    }
+
     public function testSpecialCommentPreservation()
     {
         $input  = 'body {/*! Keep me */}';