Merge branch 'release/2.2.0-beta'

Author: ollieread

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.0-beta] - 2020-09-09
+## Updated
+- Updated to support Laravel 8
+## Fixed
+- Fixed a bug where `ModelOperation::getModel()` couldn't return null
+- Fixed a bug where `Operation::shouldSkip()` wasn't behaving correctly
+
 ## [2.1.0-beta] - 2020-04-10
 ## Added
 - Added abstract operation for dealing with create & update events on models
@@ -43,7 +50,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.0-alpha] - 2020-01-17
 - Initial release
 
-[Unreleased]: https://github.com/sprocketbox/laravel-toolkit/compare/v2.0.0-beta...develop
+[Unreleased]: https://github.com/sprocketbox/laravel-toolkit/compare/v2.1.0-beta...develop
+[2.1.0-beta]: https://github.com/sprocketbox/laravel-toolkit/compare/v2.0.1-beta...v2.1.0-beta
+[2.0.1-beta]: https://github.com/sprocketbox/laravel-toolkit/compare/v2.0.0-beta...v2.0.1-beta
 [2.0.0-beta]: https://github.com/sprocketbox/laravel-toolkit/compare/v1.0.0-beta...v2.0.0-beta
 [1.0.0-beta]: https://github.com/sprocketbox/laravel-toolkit/compare/v1.0.1-alpha...v1.0.0-beta
 [1.0.2-alpha]: https://github.com/sprocketbox/laravel-toolkit/compare/v1.0.1-alpha...v1.0.2-alpha

composer.json

@@ -26,9 +26,9 @@
   },
   "require": {
     "php": "^7.4",
-    "illuminate/routing": "^6.0 || ^7.0",
-    "illuminate/database": "^6.0 || ^7.0",
-    "illuminate/validation": "^6.0 || ^7.0"
+    "illuminate/routing": "^6.0 || ^7.0 || ^8.0",
+    "illuminate/database": "^6.0 || ^7.0 || ^8.0",
+    "illuminate/validation": "^6.0 || ^7.0 || ^8.0"
   },
   "extra": {
     "laravel": {

src/Operations/ModelOperation.php

@@ -12,9 +12,9 @@
 abstract class ModelOperation extends Operation
 {
     /**
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|null
      */
-    abstract protected function getModel(): Model;
+    abstract protected function getModel(): ?Model;
 
     /**
      * @return array

src/Operations/Operation.php

@@ -90,7 +90,7 @@ protected function getPropertiesAsAttributes(array $properties, $skipIfNull = fa
      */
     private function shouldSkip(string $property, $skipIfNull = false): bool
     {
-        return (! isset($this->{$property}) && $this->{$property} === null)
+        return (! isset($this->{$property}) || $this->{$property} === null)
             && ($skipIfNull === true || (is_array($skipIfNull) && in_array($property, $skipIfNull, true)));
     }
 }