Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/version-4' into version-4
Browse files Browse the repository at this point in the history
  • Loading branch information
Gummibeer committed Aug 26, 2016
2 parents 5206e87 + 6a37f0e commit 87a3d07
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Notifynder/Helpers/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ function notifynder_config($key = null, $default = null)

return $config->get($key, $default);
}
}
}
4 changes: 2 additions & 2 deletions tests/integration/Builder/BuilderNotificationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testTypeChanger()
$this->assertInternalType('string', $notification->toDbArray()['extra']);
$this->assertJson($notification->toJson());
$this->assertInternalType('string', $notification->toString());
$this->assertInternalType('string', (string)$notification);
$this->assertInternalType('string', (string) $notification);
}

public function testOverloaded()
Expand All @@ -63,4 +63,4 @@ public function testOffsetMethods()
$notification->offsetUnset('foo');
$this->assertFalse($notification->offsetExists('foo'));
}
}
}
4 changes: 2 additions & 2 deletions tests/integration/Helpers/TypeCheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ public function testIsArray()
public function testIsArrayFailStrict()
{
$this->setExpectedException(InvalidArgumentException::class);
TypeChecker::isArray(collect([1,2,3]));
TypeChecker::isArray(collect([1, 2, 3]));
}

public function testIsArrayFail()
{
$this->assertFalse(TypeChecker::isArray(collect([1,2,3]), false));
$this->assertFalse(TypeChecker::isArray(collect([1, 2, 3]), false));
}

public function testIsIterable()
Expand Down

0 comments on commit 87a3d07

Please sign in to comment.