Skip to content

Commit

Permalink
Merge tag 'v.1.1.1' into develop
Browse files Browse the repository at this point in the history
v1.1.1
  • Loading branch information
chelout committed Oct 4, 2019
2 parents c0f64e3 + 3b71f10 commit 417d5c8
Show file tree
Hide file tree
Showing 24 changed files with 36 additions and 64 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ matrix:
- php: 7.3
- php: 7.3
env: setup=lowest
- php: 7.4
- php: 7.4
- php: 7.4snapshot
- php: 7.4snapshot
env: setup=lowest

sudo: false
Expand Down
3 changes: 1 addition & 2 deletions src/BelongsTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo as BelongsToBase;

/**
* Class BelongsTo
* Class BelongsTo.
*
* @package Chelout\RelationshipEvents
*
* @property-read \Chelout\RelationshipEvents\Concerns\HasBelongsToEvents $parent
*/
Expand Down
7 changes: 3 additions & 4 deletions src/BelongsToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Relations\BelongsToMany as BelongsToManyBase;

/**
* Class BelongsToMany
* Class BelongsToMany.
*
* @package Chelout\RelationshipEvents
*
* @property-read \Chelout\RelationshipEvents\Concerns\HasBelongsToManyEvents $parent
*/
Expand All @@ -25,7 +24,7 @@ class BelongsToMany extends BelongsToManyBase implements EventDispatcher
* Each existing model is detached, and non existing ones are attached.
*
* @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection|int|string $ids
* @param bool $touch
* @param bool $touch
*
* @return array
*/
Expand All @@ -44,7 +43,7 @@ public function toggle($ids, $touch = true)
* Sync the intermediate tables with a list of IDs or collection of models.
*
* @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection|int|string $ids
* @param bool $detaching
* @param bool $detaching
*
* @return array
*/
Expand Down
9 changes: 4 additions & 5 deletions src/Concerns/HasBelongsToEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasBelongsToEvents
* Trait HasBelongsToEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down Expand Up @@ -109,10 +108,10 @@ public static function belongsToUpdated($callback)
/**
* Fire the given event for the model relationship.
*
* @param string $event
* @param string $relation
* @param string $event
* @param string $relation
* @param \Illuminate\Database\Eloquent\Model|int|string $parent
* @param bool $halt
* @param bool $halt
*
* @return bool
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasBelongsToManyEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasBelongsToManyEvents
* Trait HasBelongsToManyEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasManyEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasManyEvents
* Trait HasManyEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasMorphManyEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasMorphManyEvents
* Trait HasMorphManyEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasMorphOneEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasMorphOneEvents
* Trait HasMorphOneEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
9 changes: 4 additions & 5 deletions src/Concerns/HasMorphToEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasMorphToEvents
* Trait HasMorphToEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down Expand Up @@ -110,10 +109,10 @@ public static function morphToUpdated($callback)
/**
* Fire the given event for the model relationship.
*
* @param string $event
* @param string $relation
* @param string $event
* @param string $relation
* @param \Illuminate\Database\Eloquent\Model|int|string $parent
* @param bool $halt
* @param bool $halt
*
* @return mixed
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasMorphToManyEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasMorphToManyEvents
* Trait HasMorphToManyEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasMorphedByManyEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasMorphedByManyEvents
* Trait HasMorphedByManyEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Concerns/HasOneEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasOneEvents
* Trait HasOneEvents.
*
* @package Chelout\RelationshipEvents\Concerns
*
* @mixin \Chelout\RelationshipEvents\Traits\HasDispatchableEvents
*/
Expand Down
4 changes: 1 addition & 3 deletions src/HasMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
use Illuminate\Database\Eloquent\Relations\HasMany as HasManyBase;

/**
* Class HasMany
*
* @package Chelout\RelationshipEvents
* Class HasMany.
*/
class HasMany extends HasManyBase implements EventDispatcher
{
Expand Down
4 changes: 1 addition & 3 deletions src/HasOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
use Illuminate\Database\Eloquent\Relations\HasOne as HasOneBase;

/**
* Class HasOne
*
* @package Chelout\RelationshipEvents
* Class HasOne.
*/
class HasOne extends HasOneBase implements EventDispatcher
{
Expand Down
4 changes: 1 addition & 3 deletions src/MorphMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
use Illuminate\Database\Eloquent\Relations\MorphMany as MorphManyBase;

/**
* Class MorphMany
*
* @package Chelout\RelationshipEvents
* Class MorphMany.
*/
class MorphMany extends MorphManyBase implements EventDispatcher
{
Expand Down
4 changes: 1 addition & 3 deletions src/MorphOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
use Illuminate\Database\Eloquent\Relations\MorphOne as MorphOneBase;

/**
* Class MorphOne
*
* @package Chelout\RelationshipEvents
* Class MorphOne.
*/
class MorphOne extends MorphOneBase implements EventDispatcher
{
Expand Down
3 changes: 1 addition & 2 deletions src/MorphTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Relations\MorphTo as MorphToBase;

/**
* Class MorphTo
* Class MorphTo.
*
* @package Chelout\RelationshipEvents
*
* @property-read \Chelout\RelationshipEvents\Concerns\HasMorphToEvents $parent
*/
Expand Down
3 changes: 1 addition & 2 deletions src/MorphToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Relations\MorphToMany as MorphToManyBase;

/**
* Class MorphToMany
* Class MorphToMany.
*
* @package Chelout\RelationshipEvents
*
* @property-read \Chelout\RelationshipEvents\Concerns\HasMorphToManyEvents $parent
*/
Expand Down
3 changes: 1 addition & 2 deletions src/MorphedByMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
use Illuminate\Database\Eloquent\Relations\MorphToMany as MorphToManyBase;

/**
* Class MorphedByMany
* Class MorphedByMany.
*
* @package Chelout\RelationshipEvents
*
* @property-read \Chelout\RelationshipEvents\Concerns\HasMorphedByManyEvents $parent
*/
Expand Down
4 changes: 1 addition & 3 deletions src/RelationshipEventsServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
use Illuminate\Support\ServiceProvider;

/**
* Class RelationshipEventsServiceProvider
*
* @package Chelout\RelationshipEvents
* Class RelationshipEventsServiceProvider.
*/
class RelationshipEventsServiceProvider extends ServiceProvider
{
Expand Down
3 changes: 1 addition & 2 deletions src/Traits/HasDispatchableEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
namespace Chelout\RelationshipEvents\Traits;

/**
* Trait HasDispatchableEvents
* Trait HasDispatchableEvents.
*
* @package Chelout\RelationshipEvents\Traits
*
* @mixin \Illuminate\Database\Eloquent\Concerns\HasEvents
*/
Expand Down
4 changes: 1 addition & 3 deletions src/Traits/HasEventDispatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
use Illuminate\Contracts\Events\Dispatcher;

/**
* Trait HasEventDispatcher
*
* @package Chelout\RelationshipEvents\Traits
* Trait HasEventDispatcher.
*/
trait HasEventDispatcher
{
Expand Down
3 changes: 1 addition & 2 deletions src/Traits/HasOneOrManyMethods.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
use Illuminate\Database\Eloquent\Model;

/**
* Trait HasOneOrManyMethods
* Trait HasOneOrManyMethods.
*
* @package Chelout\RelationshipEvents\Traits
*
* @property-read \Illuminate\Database\Eloquent\Model $related
*/
Expand Down
8 changes: 4 additions & 4 deletions src/Traits/HasRelationshipObservables.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Chelout\RelationshipEvents\Traits;

use Illuminate\Support\Str;
use ReflectionClass;
use ReflectionMethod;

/**
* Trait HasRelationshipObservables
* Trait HasRelationshipObservables.
*
* @package Chelout\RelationshipEvents\Traits
*
* @mixin \Illuminate\Database\Eloquent\Concerns\HasEvents
*/
Expand All @@ -31,7 +31,7 @@ class_uses(static::class)
)->filter(function ($trait) {
return Str::startsWith($trait, 'Chelout\RelationshipEvents\Concerns');
})->flatMap(function ($trait) {
$trait = new ReflectionClass($trait);
$trait = new ReflectionClass($trait);
$methods = $trait->getMethods(ReflectionMethod::IS_PUBLIC);

return collect($methods)->filter(function (ReflectionMethod $method) {
Expand All @@ -47,7 +47,7 @@ class_uses(static::class)
/**
* Merge relationship observables.
*
* @param array $relationshipObservables
* @param array $relationshipObservables
*
* @return void
*/
Expand Down

0 comments on commit 417d5c8

Please sign in to comment.