Skip to content

Commit 4d16f84

Browse files
Merge branch '3.4'
* 3.4: [3.4] Remove useless docblocks [3.3] More docblock fixes [2.7] More docblock fixes [TwigBridge] Fix BC break due required twig environment Random fixes Docblock fixes [DI] Fix cannot bind env var Fix some signatures in PHP-DSLs [HttpKernel] Enhance deprecation message bumped Symfony version to 3.4.0 updated VERSION for 3.4.0-BETA3 updated CHANGELOG for 3.4.0-BETA3 [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents aa3b179 + 19f15d7 commit 4d16f84

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

CacheWarmer/SerializerCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)
8080
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
8181
$supportedLoaders[] = $loader;
8282
} elseif ($loader instanceof LoaderChain) {
83-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
83+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
8484
}
8585
}
8686

CacheWarmer/ValidatorCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)
9191
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
9292
$supportedLoaders[] = $loader;
9393
} elseif ($loader instanceof LoaderChain) {
94-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
94+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
9595
}
9696
}
9797

Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getKernel()
6262
/**
6363
* Gets the profile associated with the current Response.
6464
*
65-
* @return HttpProfile A Profile instance
65+
* @return HttpProfile|false A Profile instance
6666
*/
6767
public function getProfile()
6868
{

Console/Descriptor/XmlDescriptor.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,6 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
409409
}
410410

411411
/**
412-
* @param array $arguments
413-
*
414412
* @return \DOMNode[]
415413
*/
416414
private function getArgumentNodes(array $arguments, \DOMDocument $dom)
@@ -521,10 +519,6 @@ private function getEventDispatcherListenersDocument(EventDispatcherInterface $e
521519
return $dom;
522520
}
523521

524-
/**
525-
* @param \DOMElement $element
526-
* @param array $eventListeners
527-
*/
528522
private function appendEventListenerDocument(EventDispatcherInterface $eventDispatcher, $event, \DOMElement $element, array $eventListeners)
529523
{
530524
foreach ($eventListeners as $listener) {

Controller/Controller.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ abstract class Controller implements ContainerAwareInterface
3232
* @param string $name The parameter name
3333
*
3434
* @return mixed
35+
*
36+
* @final since version 3.4
3537
*/
3638
protected function getParameter($name)
3739
{

Tests/Command/CachePruneCommandTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ private function getPruneableInterfaceMock()
9797
}
9898

9999
/**
100-
* @param KernelInterface $kernel
101-
* @param RewindableGenerator $generator
102-
*
103100
* @return CommandTester
104101
*/
105102
private function getCommandTester(KernelInterface $kernel, RewindableGenerator $generator)

0 commit comments

Comments
 (0)