Merge branch '6.x' into 7.x

Author: GrahamCampbell

CHANGELOG-6.x.md

@@ -1,6 +1,17 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.18.22...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.18.23...6.x)
+
+### Fixed
+- Fixed notifications database channel for anonymous notifiables ([#33409](https://github.com/laravel/framework/pull/33409))
+- Added float comparison null checks ([#33421](https://github.com/laravel/framework/pull/33421))
+
+
+## [v6.18.23 (2020-06-30)](https://github.com/laravel/framework/compare/v6.18.22...v6.18.23)
+
+### Fixed
+- Fixed `ConfigurationUrlParser` query decoding ([#33340](https://github.com/laravel/framework/pull/33340))
+- Correct implementation of float casting comparison ([#33322](https://github.com/laravel/framework/pull/33322))
 
 
 ## [v6.18.22 (2020-06-24)](https://github.com/laravel/framework/compare/v6.18.21...v6.18.22)

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -1412,6 +1412,10 @@ public function originalIsEquivalent($key)
             return $this->castAttribute($key, $attribute) ==
                 $this->castAttribute($key, $original);
         } elseif ($this->hasCast($key, ['real', 'float', 'double'])) {
+            if (($attribute === null && $original !== null) || ($attribute !== null && $original === null)) {
+                return false;
+            }
+
             return abs($this->castAttribute($key, $attribute) - $this->castAttribute($key, $original)) < PHP_FLOAT_EPSILON * 4;
         } elseif ($this->hasCast($key, static::$primitiveCastTypes)) {
             return $this->castAttribute($key, $attribute) ===

tests/Database/DatabaseEloquentModelTest.php

@@ -102,6 +102,16 @@ public function testIntAndNullComparisonWhenDirty()
         $this->assertTrue($model->isDirty('intAttribute'));
     }
 
+    public function testFloatAndNullComparisonWhenDirty()
+    {
+        $model = new EloquentModelCastingStub();
+        $model->floatAttribute = null;
+        $model->syncOriginal();
+        $this->assertFalse($model->isDirty('floatAttribute'));
+        $model->forceFill(['floatAttribute' => 0.0]);
+        $this->assertTrue($model->isDirty('floatAttribute'));
+    }
+
     public function testDirtyOnCastOrDateAttributes()
     {
         $model = new EloquentModelCastingStub;