Skip to content

Commit 3da7e76

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Add missing dots at the end of exception messages [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) Fix bad merge Add missing dots at the end of exception messages
2 parents 4c2fb04 + 41cd6cb commit 3da7e76

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

Command/AbstractConfigCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ protected function findExtension(string $name)
112112
public function validateConfiguration(ExtensionInterface $extension, $configuration)
113113
{
114114
if (!$configuration) {
115-
throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup', $extension->getAlias()));
115+
throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias()));
116116
}
117117

118118
if (!$configuration instanceof ConfigurationInterface) {
119-
throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', \get_class($configuration)));
119+
throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', \get_class($configuration)));
120120
}
121121
}
122122

Command/CacheClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8585
$fs->remove($oldCacheDir);
8686

8787
if (!is_writable($realCacheDir)) {
88-
throw new RuntimeException(sprintf('Unable to write in the "%s" directory', $realCacheDir));
88+
throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));
8989
}
9090

9191
$io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));

Command/ConfigDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private function getConfigForPath(array $config, string $path, string $alias)
145145

146146
foreach ($steps as $step) {
147147
if (!\array_key_exists($step, $config)) {
148-
throw new LogicException(sprintf('Unable to find configuration for "%s.%s"', $alias, $path));
148+
throw new LogicException(sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
149149
}
150150

151151
$config = $config[$step];

Controller/AbstractController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
7979
protected function getParameter(string $name)
8080
{
8181
if (!$this->container->has('parameter_bag')) {
82-
throw new ServiceNotFoundException('parameter_bag', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
82+
throw new ServiceNotFoundException('parameter_bag.', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
8383
}
8484

8585
return $this->container->get('parameter_bag')->get($name);

DependencyInjection/Compiler/ProfilerPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
3939

4040
if (isset($attributes[0]['template'])) {
4141
if (!isset($attributes[0]['id'])) {
42-
throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template', $id));
42+
throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id));
4343
}
4444
$template = [$attributes[0]['id'], $attributes[0]['template']];
4545
}

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
10851085
if ($container->fileExists($dir)) {
10861086
$dirs[] = $transPaths[] = $dir;
10871087
} else {
1088-
throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory', $dir));
1088+
throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory.', $dir));
10891089
}
10901090
}
10911091

Secrets/SodiumVault.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function loadEnvVars(): array
177177
private function loadKeys(): void
178178
{
179179
if (!\function_exists('sodium_crypto_box_seal')) {
180-
throw new \LogicException('The "sodium" PHP extension is required to deal with secrets. Alternatively, try running "composer require paragonie/sodium_compat" if you cannot enable the extension."');
180+
throw new \LogicException('The "sodium" PHP extension is required to deal with secrets. Alternatively, try running "composer require paragonie/sodium_compat" if you cannot enable the extension.".');
181181
}
182182

183183
if (null !== $this->encryptionKey || '' !== $this->decryptionKey = (string) $this->decryptionKey) {
@@ -214,7 +214,7 @@ private function export(string $file, string $data): void
214214
private function createSecretsDir(): void
215215
{
216216
if ($this->secretsDir && !is_dir($this->secretsDir) && !@mkdir($this->secretsDir, 0777, true) && !is_dir($this->secretsDir)) {
217-
throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s)', $this->secretsDir));
217+
throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s).', $this->secretsDir));
218218
}
219219

220220
$this->secretsDir = null;

Test/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected static function createClient(array $options = [], array $server = [])
5252
if (class_exists(KernelBrowser::class)) {
5353
throw new \LogicException('You cannot create the client used in functional tests if the "framework.test" config is not set to true.');
5454
}
55-
throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit"');
55+
throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit".');
5656
}
5757

5858
$client->setServerParameters($server);

0 commit comments

Comments
 (0)