Skip to content

Commit 593dff7

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix CS Fix CS
2 parents 241bb88 + f812d81 commit 593dff7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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.', \get_class($this)));
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);

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ protected function createContainer(array $data = [])
14181418

14191419
protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true)
14201420
{
1421-
$cacheKey = md5(\get_class($this).$file.serialize($data));
1421+
$cacheKey = md5(static::class.$file.serialize($data));
14221422
if ($compile && isset(self::$containerCache[$cacheKey])) {
14231423
return self::$containerCache[$cacheKey];
14241424
}

Tests/Functional/AbstractWebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ protected static function createKernel(array $options = []): KernelInterface
6969

7070
protected static function getVarDir()
7171
{
72-
return 'FB'.substr(strrchr(\get_called_class(), '\\'), 1);
72+
return 'FB'.substr(strrchr(static::class, '\\'), 1);
7373
}
7474
}

0 commit comments

Comments
 (0)