Skip to content

Commit 4c1de3f

Browse files
Merge branch '3.4'
* 3.4: [HttpFoundation] refactoring: calculate when need [Serializer] Fix extra attributes when no group specified [Intl] Make intl-data tests pass and save language aliases again [FrameworkBundle][Config] fix: do not add resource checkers for debug=false [DI] Fix "almost-circular" dependencies handling [Console] Fix CommandTester::setInputs() docblock Only enabling validation if it is present Fix displaying errors for bootstrap 4 [Serializer] readd default argument value Fix reference dump for deprecated nodes [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass [HttpKernel] Let the storage manage the session starts [VarDumper] fix trailling comma when dumping an exception [Validator] Fix TraceableValidator is reset on data collector instantiation Remove useless docblocks [FrameworkBundle] Fix docblocks [PropertyInfo] Remove useless docblocks
2 parents a522e04 + 7398276 commit 4c1de3f

File tree

217 files changed

+1919
-2367
lines changed

Some content is hidden

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

217 files changed

+1919
-2367
lines changed

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
*/
2222
class DoctrineValidationPass implements CompilerPassInterface
2323
{
24-
/**
25-
* @var string
26-
*/
2724
private $managerType;
2825

26+
/**
27+
* @param string $managerType
28+
*/
2929
public function __construct($managerType)
3030
{
3131
$this->managerType = $managerType;

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
113113
* present to enable the mapping. Set to false
114114
* to not do any check, optional.
115115
* @param string $configurationPattern Pattern for the Configuration service name
116-
* @param string $registerAliasMethodName name of Configuration class method to
116+
* @param string $registerAliasMethodName Name of Configuration class method to
117117
* register alias
118118
* @param string[] $aliasMap Map of alias to namespace
119119
*/
@@ -178,7 +178,7 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
178178
/**
179179
* Create the service definition for the metadata driver.
180180
*
181-
* @param ContainerBuilder $container passed on in case an extending class
181+
* @param ContainerBuilder $container Passed on in case an extending class
182182
* needs access to the container
183183
*
184184
* @return Definition|Reference the metadata driver to add to all chain drivers

src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,9 @@
2424
*/
2525
class DoctrineChoiceLoader implements ChoiceLoaderInterface
2626
{
27-
/**
28-
* @var ObjectManager
29-
*/
3027
private $manager;
31-
32-
/**
33-
* @var string
34-
*/
3528
private $class;
36-
37-
/**
38-
* @var IdReader
39-
*/
4029
private $idReader;
41-
42-
/**
43-
* @var null|EntityLoaderInterface
44-
*/
4530
private $objectLoader;
4631

4732
/**
@@ -57,13 +42,10 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
5742
* mapper implementations.
5843
*
5944
* @param ObjectManager $manager The object manager
60-
* @param string $class The class name of the
61-
* loaded objects
62-
* @param IdReader $idReader the reader for the object
63-
* IDs
45+
* @param string $class The class name of the loaded objects
46+
* @param IdReader $idReader The reader for the object IDs
6447
* @param null|EntityLoaderInterface $objectLoader The objects loader
65-
* @param ChoiceListFactoryInterface $factory The factory for creating
66-
* the loaded choice list
48+
* @param ChoiceListFactoryInterface $factory The factory for creating the loaded choice list
6749
*/
6850
public function __construct(ObjectManager $manager, $class, $idReader = null, $objectLoader = null, $factory = null)
6951
{

src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,10 @@
2424
*/
2525
class IdReader
2626
{
27-
/**
28-
* @var ObjectManager
29-
*/
3027
private $om;
31-
32-
/**
33-
* @var ClassMetadata
34-
*/
3528
private $classMetadata;
36-
37-
/**
38-
* @var bool
39-
*/
4029
private $singleId;
41-
42-
/**
43-
* @var bool
44-
*/
4530
private $intId;
46-
47-
/**
48-
* @var string
49-
*/
5031
private $idField;
5132

5233
/**

src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
*/
2828
class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeExtractorInterface
2929
{
30-
/**
31-
* @var ClassMetadataFactory
32-
*/
3330
private $classMetadataFactory;
3431

3532
public function __construct(ClassMetadataFactory $classMetadataFactory)

src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*/
2727
class UniqueEntityValidator extends ConstraintValidator
2828
{
29-
/**
30-
* @var ManagerRegistry
31-
*/
3229
private $registry;
3330

3431
public function __construct(ManagerRegistry $registry)

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\PhpUnit\Legacy;
1313

1414
use PHPUnit\Framework\Test;
15+
use PHPUnit\Framework\TestCase;
1516
use PHPUnit\Framework\Warning;
1617

1718
/**
@@ -36,6 +37,10 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo
3637

3738
public function startTest($test)
3839
{
40+
if (!$test instanceof TestCase) {
41+
return;
42+
}
43+
3944
$annotations = $test->getAnnotations();
4045

4146
$ignoredAnnotations = array('covers', 'coversDefaultClass', 'coversNothing');

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,8 @@
2626
*/
2727
class ProxyDumper implements DumperInterface
2828
{
29-
/**
30-
* @var string
31-
*/
3229
private $salt;
33-
34-
/**
35-
* @var LazyLoadingValueHolderGenerator
36-
*/
3730
private $proxyGenerator;
38-
39-
/**
40-
* @var BaseGeneratorStrategy
41-
*/
4231
private $classGenerator;
4332

4433
/**

src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
class StopwatchExtension extends AbstractExtension
2424
{
2525
private $stopwatch;
26-
27-
/**
28-
* @var bool
29-
*/
3026
private $enabled;
3127

3228
public function __construct(Stopwatch $stopwatch = null, $enabled = true)

src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
*/
3131
class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
3232
{
33-
/**
34-
* @var Scope
35-
*/
3633
private $scope;
3734

3835
public function __construct()

0 commit comments

Comments
 (0)