8000 Merge branch '3.4' into 4.3 · symfony/symfony@d5ca9ec · GitHub
[go: up one dir, main page]
Skip to content

Commit d5ca9ec

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.3
* 3.4: Fix CS
2 parents cad1417 + 861783c commit d5ca9ec

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,7 @@ private function getManagerName(ContainerBuilder $container)
222222
}
223223
}
224224

225-
throw new InvalidArgumentException(sprintf(
226-
'Could not find the manager name parameter in the container. Tried the following parameter names: "%s"',
227-
implode('", "', $this->managerParameters)
228-
));
225+
throw new InvalidArgumentException(sprintf('Could not find the manager name parameter in the container. Tried the following parameter names: "%s"', implode('", "', $this->managerParameters)));
229226
}
230227

231228
/**

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
1919
use Symfony\Component\DependencyInjection\ContainerBuilder;
2020
use Symfony\Component\DependencyInjection\Definition;
21-
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
2221
use Symfony\Component\DependencyInjection\Reference;
2322
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
2423
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;

‎src/Symfony/Component/Ldap/Ldap.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ public function escape($subject, $ignore = '', $flags = 0)
7373
public static function create($adapter, array $config = []): self
7474
{
7575
if (!isset(self::$adapterMap[$adapter])) {
76-
throw new DriverNotFoundException(sprintf(
77-
'Adapter "%s" not found. You should use one of: %s',
78-
$adapter,
79-
implode(', ', self::$adapterMap)
80-
));
76+
throw new DriverNotFoundException(sprintf('Adapter "%s" not found. You should use one of: %s', $adapter, implode(', ', self::$adapterMap)));
8177
}
8278

8379
$class = self::$adapterMap[$adapter];

‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ public function match($pathinfo)
9393
throw new NoConfigurationException();
9494
}
9595

96-
throw 0 < \count($this->allow)
97-
? new MethodNotAllowedException(array_unique($this->allow))
98-
: new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
96+
throw 0 < \count($this->allow) ? new MethodNotAllowedException(array_unique($this->allow)) : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
9997
}
10098

10199
/**

0 commit comments

Comments
 (0)
0