Skip to content

Commit

Permalink
Merge branch '10.x' into 11.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
driesvints committed May 24, 2024
2 parents 40ebbed + 7d7ab3b commit f36e042
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions src/Illuminate/Cache/DatabaseStore.php
Original file line number Diff line number Diff line change
@@ -158,9 +158,7 @@ public function add($key, $value, $seconds)
$value = $this->serialize($value);
$expiration = $this->getTime() + $seconds;

$doesntSupportInsertOrIgnore = [SqlServerConnection::class];

if (! in_array(get_class($this->getConnection()), $doesntSupportInsertOrIgnore)) {
if (! $this->getConnection() instanceof SqlServerConnection) {
return $this->table()->insertOrIgnore(compact('key', 'value', 'expiration')) > 0;
}

2 changes: 1 addition & 1 deletion tests/Validation/ValidationRequiredIfTest.php
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

class ValidationRequiredIfTest extends TestCase
{
public function testItClousureReturnsFormatsAStringVersionOfTheRule()
public function testItClosureReturnsFormatsAStringVersionOfTheRule()
{
$rule = new RequiredIf(function () {
return true;

0 comments on commit f36e042

Please sign in to comment.