Skip to content

Commit f4cbfbc

Browse files
Merge branch '4.0' into 4.1
* 4.0: Fix Clidumper tests Enable the fixer enforcing fully-qualified calls for compiler-optimized functions Apply fixers Disable the native_constant_invocation fixer until it can be scoped Update the list of excluded files for the CS fixer
1 parent 5534cc0 commit f4cbfbc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

DataCollector/MessengerDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private function collectMessage(string $busName, array $tracedMessage)
102102
if (array_key_exists('result', $tracedMessage)) {
103103
$result = $tracedMessage['result'];
104104
$debugRepresentation['result'] = array(
105-
'type' => \is_object($result) ? \get_class($result) : gettype($result),
105+
'type' => \is_object($result) ? \get_class($result) : \gettype($result),
106106
'value' => $result,
107107
);
108108
}

Tests/Command/DebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DebugCommandTest extends TestCase
2828
{
2929
protected function setUp()
3030
{
31-
putenv('COLUMNS='.(119 + strlen(PHP_EOL)));
31+
putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
3232
}
3333

3434
protected function tearDown()

Transport/AmqpExt/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,6 @@ private function clear(): void
218218

219219
private function shouldSetup(): bool
220220
{
221-
return !array_key_exists('auto-setup', $this->connectionCredentials) || !in_array($this->connectionCredentials['auto-setup'], array(false, 'false'), true);
221+
return !array_key_exists('auto-setup', $this->connectionCredentials) || !\in_array($this->connectionCredentials['auto-setup'], array(false, 'false'), true);
222222
}
223223
}

0 commit comments

Comments
 (0)