Merge branch 'feature/laravel-6' into develop

chelout · Sep 4, 2019 · b67dbdc · b67dbdc
2 parents 16034f6 + a326986
commit b67dbdc
Show file tree

Hide file tree

Showing 37 changed files with 240 additions and 88 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,15 +7,15 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-    - php: 7.1
-      env: setup=lowest
     - php: 7.2
     - php: 7.2
       env: setup=lowest
     - php: 7.3
     - php: 7.3
       env: setup=lowest
+    - php: 7.4
+    - php: 7.4
+      env: setup=lowest
 
 sudo: false
 

diff --git a/composer.json b/composer.json
@@ -11,15 +11,16 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
-        "illuminate/container": "~5.8.0",
-        "illuminate/database": "~5.8.0",
-        "illuminate/events": "~5.8.0",
-        "illuminate/support": "~5.8.0"
+        "php": "^7.2",
+        "illuminate/container": "^6.0",
+        "illuminate/database": "^6.0",
+        "illuminate/events": "^6.0",
+        "illuminate/support": "^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0|~8.0",
-        "orchestra/testbench": "3.8.*"
+        "phpunit/phpunit": "^8.3",
+        "orchestra/testbench-core": "^4.0",
+        "orchestra/testbench": "^4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/BelongsTo.php b/src/BelongsTo.php
@@ -4,9 +4,15 @@
 
 use Chelout\RelationshipEvents\Contracts\EventDispatcher;
 use Chelout\RelationshipEvents\Traits\HasEventDispatcher;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo as BelongsToBase;
 
+/**
+ * Class BelongsTo
+ *
+ * @package Chelout\RelationshipEvents
+ *
+ * @property-read \Chelout\RelationshipEvents\Concerns\HasBelongsToEvents $parent
+ */
 class BelongsTo extends BelongsToBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/BelongsToMany.php b/src/BelongsToMany.php
@@ -4,9 +4,15 @@
 
 use Chelout\RelationshipEvents\Contracts\EventDispatcher;
 use Chelout\RelationshipEvents\Traits\HasEventDispatcher;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as BelongsToManyBase;
 
+/**
+ * Class BelongsToMany
+ *
+ * @package Chelout\RelationshipEvents
+ *
+ * @property-read \Chelout\RelationshipEvents\Concerns\HasBelongsToManyEvents $parent
+ */
 class BelongsToMany extends BelongsToManyBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/Concerns/HasBelongsToEvents.php b/src/Concerns/HasBelongsToEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasBelongsToEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasBelongsToEvents
 {
     /**

diff --git a/src/Concerns/HasBelongsToManyEvents.php b/src/Concerns/HasBelongsToManyEvents.php
@@ -7,6 +7,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasBelongsToManyEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasBelongsToManyEvents
 {
     /**

diff --git a/src/Concerns/HasManyEvents.php b/src/Concerns/HasManyEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasManyEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasManyEvents
 {
     /**

diff --git a/src/Concerns/HasMorphManyEvents.php b/src/Concerns/HasMorphManyEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasMorphManyEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasMorphManyEvents
 {
     /**

diff --git a/src/Concerns/HasMorphOneEvents.php b/src/Concerns/HasMorphOneEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasMorphOneEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasMorphOneEvents
 {
     /**

diff --git a/src/Concerns/HasMorphToEvents.php b/src/Concerns/HasMorphToEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasMorphToEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasMorphToEvents
 {
     /**

diff --git a/src/Concerns/HasMorphToManyEvents.php b/src/Concerns/HasMorphToManyEvents.php
@@ -7,6 +7,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasMorphToManyEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasMorphToManyEvents
 {
     /**

diff --git a/src/Concerns/HasMorphedByManyEvents.php b/src/Concerns/HasMorphedByManyEvents.php
@@ -7,6 +7,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasMorphedByManyEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasMorphedByManyEvents
 {
     /**

diff --git a/src/Concerns/HasOneEvents.php b/src/Concerns/HasOneEvents.php
@@ -6,6 +6,13 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasOneEvents
+ *
+ * @package Chelout\RelationshipEvents\Concerns
+ *
+ * @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
+ */
 trait HasOneEvents
 {
     /**

diff --git a/src/HasMany.php b/src/HasMany.php
@@ -7,6 +7,11 @@
 use Chelout\RelationshipEvents\Traits\HasOneOrManyMethods;
 use Illuminate\Database\Eloquent\Relations\HasMany as HasManyBase;
 
+/**
+ * Class HasMany
+ *
+ * @package Chelout\RelationshipEvents
+ */
 class HasMany extends HasManyBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/HasOne.php b/src/HasOne.php
@@ -7,6 +7,11 @@
 use Chelout\RelationshipEvents\Traits\HasOneOrManyMethods;
 use Illuminate\Database\Eloquent\Relations\HasOne as HasOneBase;
 
+/**
+ * Class HasOne
+ *
+ * @package Chelout\RelationshipEvents
+ */
 class HasOne extends HasOneBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/MorphMany.php b/src/MorphMany.php
@@ -8,6 +8,11 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany as MorphManyBase;
 
+/**
+ * Class MorphMany
+ *
+ * @package Chelout\RelationshipEvents
+ */
 class MorphMany extends MorphManyBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/MorphOne.php b/src/MorphOne.php
@@ -7,6 +7,11 @@
 use Chelout\RelationshipEvents\Traits\HasOneOrManyMethods;
 use Illuminate\Database\Eloquent\Relations\MorphOne as MorphOneBase;
 
+/**
+ * Class MorphOne
+ *
+ * @package Chelout\RelationshipEvents
+ */
 class MorphOne extends MorphOneBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/MorphTo.php b/src/MorphTo.php
@@ -4,9 +4,15 @@
 
 use Chelout\RelationshipEvents\Contracts\EventDispatcher;
 use Chelout\RelationshipEvents\Traits\HasEventDispatcher;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo as MorphToBase;
 
+/**
+ * Class MorphTo
+ *
+ * @package Chelout\RelationshipEvents
+ *
+ * @property-read \Chelout\RelationshipEvents\Concerns\HasMorphToEvents $parent
+ */
 class MorphTo extends MorphToBase implements EventDispatcher
 {
     use HasEventDispatcher;
@@ -62,7 +68,8 @@ public function update(array $attributes)
 
         $this->parent->fireModelMorphToEvent('updating', $this->relationName, $related);
 
-        if ($related && $result = $related->fill($attributes)->save()) {
+        $result = $related->fill($attributes)->save();
+        if ($related && $result) {
             $this->parent->fireModelMorphToEvent('updated', $this->relationName, $related);
         }
 

diff --git a/src/MorphToMany.php b/src/MorphToMany.php
@@ -4,9 +4,15 @@
 
 use Chelout\RelationshipEvents\Contracts\EventDispatcher;
 use Chelout\RelationshipEvents\Traits\HasEventDispatcher;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphToMany as MorphToManyBase;
 
+/**
+ * Class MorphToMany
+ *
+ * @package Chelout\RelationshipEvents
+ *
+ * @property-read \Chelout\RelationshipEvents\Concerns\HasMorphToManyEvents $parent
+ */
 class MorphToMany extends MorphToManyBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/MorphedByMany.php b/src/MorphedByMany.php
@@ -4,9 +4,15 @@
 
 use Chelout\RelationshipEvents\Contracts\EventDispatcher;
 use Chelout\RelationshipEvents\Traits\HasEventDispatcher;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphToMany as MorphToManyBase;
 
+/**
+ * Class MorphedByMany
+ *
+ * @package Chelout\RelationshipEvents
+ *
+ * @property-read \Chelout\RelationshipEvents\Concerns\HasMorphedByManyEvents $parent
+ */
 class MorphedByMany extends MorphToManyBase implements EventDispatcher
 {
     use HasEventDispatcher;

diff --git a/src/RelationshipEventsServiceProvider.php b/src/RelationshipEventsServiceProvider.php
@@ -4,6 +4,11 @@
 
 use Illuminate\Support\ServiceProvider;
 
+/**
+ * Class RelationshipEventsServiceProvider
+ *
+ * @package Chelout\RelationshipEvents
+ */
 class RelationshipEventsServiceProvider extends ServiceProvider
 {
     /**

diff --git a/src/Traits/HasDispatchableEvents.php b/src/Traits/HasDispatchableEvents.php
@@ -2,6 +2,13 @@
 
 namespace Chelout\RelationshipEvents\Traits;
 
+/**
+ * Trait HasDispatchableEvents
+ *
+ * @package Chelout\RelationshipEvents\Traits
+ *
+ * @mixin \Illuminate\Database\Eloquent\Concerns\HasEvents
+ */
 trait HasDispatchableEvents
 {
     /**

diff --git a/src/Traits/HasEventDispatcher.php b/src/Traits/HasEventDispatcher.php
@@ -4,6 +4,11 @@
 
 use Illuminate\Contracts\Events\Dispatcher;
 
+/**
+ * Trait HasEventDispatcher
+ *
+ * @package Chelout\RelationshipEvents\Traits
+ */
 trait HasEventDispatcher
 {
     /**

diff --git a/src/Traits/HasOneOrManyMethods.php b/src/Traits/HasOneOrManyMethods.php
@@ -5,6 +5,13 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * Trait HasOneOrManyMethods
+ *
+ * @package Chelout\RelationshipEvents\Traits
+ *
+ * @property-read \Illuminate\Database\Eloquent\Model $related
+ */
 trait HasOneOrManyMethods
 {
     /**
@@ -16,7 +23,7 @@ trait HasOneOrManyMethods
      */
     public function create(array $attributes = [])
     {
-        return tap($this->related->newInstance($attributes), function ($instance) {
+        return tap($this->related->newInstance($attributes), function (Model $instance) {
             $this->fireModelRelationshipEvent('creating', $instance);
 
             $this->setForeignAttributesForCreate($instance);