Skip to content

Commit 9a7d2f2

Browse files
Merge branch '3.3' into 3.4
* 3.3: (23 commits) Tests and fix for issue in array model data in EntityType field with multiple=true [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible removed useless PHPDoc [Form] Fix FormInterface::submit() annotation [PHPUnitBridge] don't remove when set to empty string PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4 HttpCache does not consider ESI resources in HEAD requests Fix translation for "This field was not expected" [Routing] Enhance Route(Collection) docblocks Added improvement for accuracy in MoneyToLocalizedStringTransformer. Removed unused private property Use correct verb form in the pull request template Use PHP_MAXPATHLEN in Filesystem. Added null as explicit return type (?TokenInterface) [FrameworkBundle] Fix Routing\DelegatingLoader Render all line breaks according to the exception message [Form] Fix phpdoc [DI] remove confusing code [Form] Fixed GroupSequence with "constraints" option [Validator] Clarify UUID validator behavior ...
2 parents 9830295 + 1c9ad51 commit 9a7d2f2

22 files changed

+5
-52
lines changed

CacheWarmer/RouterCacheWarmer.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterf
2929
protected $router;
3030

3131
/**
32-
* Constructor.
33-
*
3432
* @param ContainerInterface $container
3533
*/
3634
public function __construct($container)

CacheWarmer/TemplateFinder.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class TemplateFinder implements TemplateFinderInterface
3030
private $templates;
3131

3232
/**
33-
* Constructor.
34-
*
3533
* @param KernelInterface $kernel A KernelInterface instance
3634
* @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance
3735
* @param string $rootDir The directory where global templates can be stored

CacheWarmer/TemplatePathsCacheWarmer.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer
2626
protected $locator;
2727

2828
/**
29-
* Constructor.
30-
*
3129
* @param TemplateFinderInterface $finder A template finder
3230
* @param TemplateLocator $locator The template locator
3331
*/

Console/Application.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
use Symfony\Component\HttpKernel\Bundle\Bundle;
2626

2727
/**
28-
* Application.
29-
*
3028
* @author Fabien Potencier <[email protected]>
3129
*/
3230
class Application extends BaseApplication
@@ -36,8 +34,6 @@ class Application extends BaseApplication
3634
private $registrationErrors = array();
3735

3836
/**
39-
* Constructor.
40-
*
4137
* @param KernelInterface $kernel A KernelInterface instance
4238
*/
4339
public function __construct(KernelInterface $kernel)

Console/Helper/DescriptorHelper.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
*/
2525
class DescriptorHelper extends BaseDescriptorHelper
2626
{
27-
/**
28-
* Constructor.
29-
*/
3027
public function __construct()
3128
{
3229
$this

Controller/ControllerNameParser.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class ControllerNameParser
2525
protected $kernel;
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param KernelInterface $kernel A KernelInterface instance
3129
*/
3230
public function __construct(KernelInterface $kernel)

Controller/ControllerResolver.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717
use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
1818

1919
/**
20-
* ControllerResolver.
21-
*
2220
* @author Fabien Potencier <[email protected]>
2321
*/
2422
class ControllerResolver extends ContainerControllerResolver
2523
{
2624
protected $parser;
2725

2826
/**
29-
* Constructor.
30-
*
3127
* @param ContainerInterface $container A ContainerInterface instance
3228
* @param ControllerNameParser $parser A ControllerNameParser instance
3329
* @param LoggerInterface $logger A LoggerInterface instance

HttpCache/HttpCache.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ abstract class HttpCache extends BaseHttpCache
2929
protected $kernel;
3030

3131
/**
32-
* Constructor.
33-
*
3432
* @param HttpKernelInterface $kernel An HttpKernelInterface instance
3533
* @param string $cacheDir The cache directory (default used if null)
3634
*/

Routing/DelegatingLoader.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class DelegatingLoader extends BaseDelegatingLoader
3030
private $loading = false;
3131

3232
/**
33-
* Constructor.
34-
*
3533
* @param ControllerNameParser $parser A ControllerNameParser instance
3634
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
3735
*/
@@ -75,7 +73,7 @@ public function load($resource, $type = null)
7573
}
7674

7775
foreach ($collection->all() as $route) {
78-
if (!$controller = $route->getDefault('_controller')) {
76+
if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
7977
continue;
8078
}
8179

Routing/Router.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
3333
private $collectedParameters = array();
3434

3535
/**
36-
* Constructor.
37-
*
3836
* @param ContainerInterface $container A ContainerInterface instance
3937
* @param mixed $resource The main resource to load
4038
* @param array $options An array of options

0 commit comments

Comments
 (0)