Skip to content

Commit 74808bc

Browse files
Merge branch '2.7' into 2.8
* 2.7: (22 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 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 [Filesystem] Fixed makePathRelative ...
2 parents fed7aac + 0bf7ca0 commit 74808bc

18 files changed

+17
-66
lines changed

Annotation/Route.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class Route
3232
private $condition;
3333

3434
/**
35-
* Constructor.
36-
*
3735
* @param array $data An array of key/value parameters
3836
*
3937
* @throws \BadMethodCallException

CompiledRoute.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class CompiledRoute implements \Serializable
2828
private $hostTokens;
2929

3030
/**
31-
* Constructor.
32-
*
3331
* @param string $staticPrefix The static prefix of the compiled route
3432
* @param string $regex The regular expression to use to match this route
3533
* @param array $tokens An array of tokens to use to generate URL for this route

Generator/Dumper/GeneratorDumper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ abstract class GeneratorDumper implements GeneratorDumperInterface
2626
private $routes;
2727

2828
/**
29-
* Constructor.
30-
*
3129
* @param RouteCollection $routes The RouteCollection to dump
3230
*/
3331
public function __construct(RouteCollection $routes)

Generator/Dumper/PhpGeneratorDumper.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,13 @@ public function dump(array $options = array())
4646
use Psr\Log\LoggerInterface;
4747
4848
/**
49-
* {$options['class']}
50-
*
5149
* This class has been auto-generated
5250
* by the Symfony Routing Component.
5351
*/
5452
class {$options['class']} extends {$options['base_class']}
5553
{
5654
private static \$declaredRoutes;
5755
58-
/**
59-
* Constructor.
60-
*/
6156
public function __construct(RequestContext \$context, LoggerInterface \$logger = null)
6257
{
6358
\$this->context = \$context;

Generator/UrlGenerator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
7676
);
7777

7878
/**
79-
* Constructor.
80-
*
8179
* @param RouteCollection $routes A RouteCollection instance
8280
* @param RequestContext $context The context
8381
* @param LoggerInterface|null $logger A logger instance

Loader/AnnotationClassLoader.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ abstract class AnnotationClassLoader implements LoaderInterface
7373
protected $defaultRouteIndex = 0;
7474

7575
/**
76-
* Constructor.
77-
*
7876
* @param Reader $reader
7977
*/
8078
public function __construct(Reader $reader)

Loader/AnnotationFileLoader.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class AnnotationFileLoader extends FileLoader
2727
protected $loader;
2828

2929
/**
30-
* Constructor.
31-
*
3230
* @param FileLocatorInterface $locator A FileLocator instance
3331
* @param AnnotationClassLoader $loader An AnnotationClassLoader instance
3432
*

Matcher/Dumper/DumperRoute.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class DumperRoute
3333
private $route;
3434

3535
/**
36-
* Constructor.
37-
*
3836
* @param string $name The route name
3937
* @param Route $route The route
4038
*/

Matcher/Dumper/MatcherDumper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ abstract class MatcherDumper implements MatcherDumperInterface
2626
private $routes;
2727

2828
/**
29-
* Constructor.
30-
*
3129
* @param RouteCollection $routes The RouteCollection to dump
3230
*/
3331
public function __construct(RouteCollection $routes)

Matcher/Dumper/PhpMatcherDumper.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,11 @@ public function dump(array $options = array())
6363
use Symfony\Component\Routing\RequestContext;
6464
6565
/**
66-
* {$options['class']}.
67-
*
6866
* This class has been auto-generated
6967
* by the Symfony Routing Component.
7068
*/
7169
class {$options['class']} extends {$options['base_class']}
7270
{
73-
/**
74-
* Constructor.
75-
*/
7671
public function __construct(RequestContext \$context)
7772
{
7873
\$this->context = \$context;

0 commit comments

Comments
 (0)