Skip to content

Commit 1b43d39

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: fixed CS fixed CS fixed CS Do not log or call the proxy function when the locale is the same Added missing required dependencies on psr/cache and psr/container in symfony/cache-contracts and symfony/service-contracts respectively. [HttpClient] fix closing debug stream prematurely [Mailer] made code more robust Restore compatibility with php 5.5 fixed sender/recipients in SMTP Envelope collect called listeners information only once [HttpKernel] Remove TestEventDispatcher.
2 parents 88eb9cb + 114f556 commit 1b43d39

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

ClassExistsMock.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ public static function withMockedClasses(array $classes)
3030

3131
public static function class_exists($name, $autoload = true)
3232
{
33-
return (bool) (self::$classes[ltrim($name, '\\')] ?? \class_exists($name, $autoload));
33+
return (bool) (self::$classes[ltrim($name, '\\')] ?? class_exists($name, $autoload));
3434
}
3535

3636
public static function interface_exists($name, $autoload = true)
3737
{
38-
return (bool) (self::$classes[ltrim($name, '\\')] ?? \interface_exists($name, $autoload));
38+
return (bool) (self::$classes[ltrim($name, '\\')] ?? interface_exists($name, $autoload));
3939
}
4040

4141
public static function trait_exists($name, $autoload = true)
4242
{
43-
return (bool) (self::$classes[ltrim($name, '\\')] ?? \trait_exists($name, $autoload));
43+
return (bool) (self::$classes[ltrim($name, '\\')] ?? trait_exists($name, $autoload));
4444
}
4545

4646
public static function register($class)

DeprecationErrorHandler/Configuration.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,12 @@ public function isEnabled()
9090
*/
9191
public function tolerates(array $deprecations)
9292
{
93-
$deprecationCounts = array_filter($deprecations, function ($key) {
94-
return false !== strpos($key, 'Count') && false === strpos($key, 'legacy');
95-
}, ARRAY_FILTER_USE_KEY);
93+
$deprecationCounts = [];
94+
foreach ($deprecations as $key => $deprecation) {
95+
if (false !== strpos($key, 'Count') && false === strpos($key, 'legacy')) {
96+
$deprecationCounts[$key] = $deprecation;
97+
}
98+
}
9699

97100
if (array_sum($deprecationCounts) > $this->thresholds['total']) {
98101
return false;

Legacy/SymfonyTestsListenerTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(array $mockedNamespaces = array())
5353
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
5454
}
5555

56-
$enableDebugClassLoader = \class_exists('Symfony\Component\Debug\DebugClassLoader');
56+
$enableDebugClassLoader = class_exists('Symfony\Component\Debug\DebugClassLoader');
5757

5858
foreach ($mockedNamespaces as $type => $namespaces) {
5959
if (!\is_array($namespaces)) {

0 commit comments

Comments
 (0)