Skip to content

Commit

Permalink
Merge branch '5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
jarektkaczyk committed Mar 3, 2018
2 parents dc1666e + 7eb58b5 commit e43e03f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/database": "5.3.*|5.4.*"
"illuminate/database": "5.3.*|5.4.*|5.5.*"
},
"require-dev": {
"crysalead/kahlan": "~1.1"
Expand Down
2 changes: 1 addition & 1 deletion src/Hookable.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function save(array $options = [])
*/
public function isDirty($attributes = null)
{
if (! is_array($attributes) && !is_null($attributes)) {
if (! is_array($attributes)) {
$attributes = func_get_args();
}

Expand Down

0 comments on commit e43e03f

Please sign in to comment.