Skip to content

Commit 1bc4aa8

Browse files
committed
Merge tag 'v11.45.3' into 12.x
Signed-off-by: Mior Muhammad Zaki <[email protected]>
2 parents dcfcaff + f88bace commit 1bc4aa8

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

src/Illuminate/Foundation/Exceptions/Renderer/Listener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function onQueryExecuted(QueryExecuted $event)
6767
'connectionName' => $event->connectionName,
6868
'time' => $event->time,
6969
'sql' => $event->sql,
70-
'bindings' => $event->bindings,
70+
'bindings' => $event->connection->prepareBindings($event->bindings),
7171
];
7272
}
7373
}

src/Illuminate/Foundation/Testing/Concerns/InteractsWithTestCaseLifecycle.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
use Illuminate\Support\Once;
3434
use Illuminate\Support\Sleep;
3535
use Illuminate\Support\Str;
36+
use Illuminate\Validation\Validator;
3637
use Illuminate\View\Component;
3738
use Mockery;
3839
use Mockery\Exception\InvalidCountException;
@@ -187,6 +188,7 @@ protected function tearDownTheTestEnvironment(): void
187188
TrustProxies::flushState();
188189
TrustHosts::flushState();
189190
ValidateCsrfToken::flushState();
191+
Validator::flushState();
190192
WorkCommand::flushState();
191193

192194
if ($this->callbackException) {

src/Illuminate/Validation/Validator.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,6 +1661,16 @@ protected function callClassBasedExtension($callback, $parameters)
16611661
return $this->container->make($class)->{$method}(...array_values($parameters));
16621662
}
16631663

1664+
/**
1665+
* Flush the validator's global state.
1666+
*
1667+
* @return void
1668+
*/
1669+
public static function flushState()
1670+
{
1671+
static::$placeholderHash = null;
1672+
}
1673+
16641674
/**
16651675
* Handle dynamic calls to class methods.
16661676
*

tests/Broadcasting/UsePusherChannelsNamesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class UsePusherChannelsNamesTest extends TestCase
1111
{
1212
#[DataProvider('channelsProvider')]
13-
public function testChannelNameNormalization($requestChannelName, $normalizedName, $_)
13+
public function testChannelNameNormalization($requestChannelName, $normalizedName, $guarded)
1414
{
1515
$broadcaster = new FakeBroadcasterUsingPusherChannelsNames;
1616

@@ -44,7 +44,7 @@ public function testChannelNamePatternMatching()
4444
}
4545

4646
#[DataProvider('channelsProvider')]
47-
public function testIsGuardedChannel($requestChannelName, $_, $guarded)
47+
public function testIsGuardedChannel($requestChannelName, $normalizedName, $guarded)
4848
{
4949
$broadcaster = new FakeBroadcasterUsingPusherChannelsNames;
5050

0 commit comments

Comments
 (0)