Skip to content

Commit e2185bc

Browse files
Merge branch '4.4' into 5.2
* 4.4: Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents 501fa51 + cf0f3c9 commit e2185bc

File tree

87 files changed

+147
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+147
-284
lines changed

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ class ControllerResolver extends ContainerControllerResolver
2626
*/
2727
protected function instantiateController($class): object
2828
{
29-
return $this->configureController(parent::instantiateController($class), $class);
30-
}
29+
$controller = parent::instantiateController($class);
3130

32-
private function configureController($controller, string $class): object
33-
{
3431
if ($controller instanceof ContainerAwareInterface) {
3532
$controller->setContainer($this->container);
3633
}

src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
use Symfony\Component\HttpKernel\DataCollector\RouterDataCollector as BaseRouterDataCollector;
1717

1818
/**
19-
* RouterDataCollector.
20-
*
2119
* @author Fabien Potencier <fabien@symfony.com>
2220
*
2321
* @final

src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
2525
/**
2626
* Configures the _controller default parameter of a given Route instance.
2727
*
28-
* @param mixed $annot The annotation class instance
28+
* @param object $annot The annotation class instance
2929
*/
3030
protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
3131
{

src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
use Symfony\Component\Translation\Translator as BaseTranslator;
2121

2222
/**
23-
* Translator.
24-
*
2523
* @author Fabien Potencier <fabien@symfony.com>
2624
*/
2725
class Translator extends BaseTranslator implements WarmableInterface

src/Symfony/Component/Config/Resource/ClassExistenceResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public function __construct(string $resource, bool $exists = null)
4242
}
4343
}
4444

45-
/**
46-
* {@inheritdoc}
47-
*/
4845
public function __toString(): string
4946
{
5047
return $this->resource;

src/Symfony/Component/Config/Resource/ComposerResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ public function getVendors(): array
3535
return array_keys($this->vendors);
3636
}
3737

38-
/**
39-
* {@inheritdoc}
40-
*/
4138
public function __toString(): string
4239
{
4340
return __CLASS__;

src/Symfony/Component/Config/Resource/DirectoryResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public function __construct(string $resource, string $pattern = null)
3939
}
4040
}
4141

42-
/**
43-
* {@inheritdoc}
44-
*/
4542
public function __toString(): string
4643
{
4744
return md5(serialize([$this->resource, $this->pattern]));

src/Symfony/Component/Config/Resource/FileExistenceResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public function __construct(string $resource)
3636
$this->exists = file_exists($resource);
3737
}
3838

39-
/**
40-
* {@inheritdoc}
41-
*/
4239
public function __toString(): string
4340
{
4441
return $this->resource;

src/Symfony/Component/Config/Resource/FileResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public function __construct(string $resource)
4141
}
4242
}
4343

44-
/**
45-
* {@inheritdoc}
46-
*/
4744
public function __toString(): string
4845
{
4946
return $this->resource;

src/Symfony/Component/Config/Resource/GlobResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ public function getPrefix(): string
6060
return $this->prefix;
6161
}
6262

63-
/**
64-
* {@inheritdoc}
65-
*/
6663
public function __toString(): string
6764
{
6865
return 'glob.'.$this->prefix.(int) $this->recursive.$this->pattern.(int) $this->forExclusion.implode("\0", $this->excludedPrefixes);

0 commit comments

Comments
 (0)