8000 Merge branch '2.8' into 3.3 · symfony/symfony@b354d6c · GitHub
[go: up one dir, main page]
Skip to content

Commit b354d6c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: [Intl] Make intl-data tests pass and save language aliases again Remove useless docblocks [PropertyInfo] Remove useless docblocks
2 parents c57cb8e + 9bc9474 commit b354d6c

File tree

194 files changed

+1442
-2194
lines changed

Some content is hidden

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

194 files changed

+1442
-2194
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/ExpressionLanguage/DoctrineParserCache.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
*/
2525
class DoctrineParserCache implements ParserCacheInterface
2626
{
27-
/**
28-
* @var Cache
29-
*/
3027
private $cache;
3128

3229
public function __construct(Cache $cache)

‎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($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/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()

‎src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
4242
*/
4343
private $prefix = '';
4444

45-
/**
46-
* The twig environment.
47-
*
48-
* @var Environment
49-
*/
5045
private $twig;
5146

5247
public function __construct(Environment $twig)

‎src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public function addLoader($format, LoaderInterface $loader)
4343
/**
4444
* Loads translation messages from a directory to the catalogue.
4545
*
46-
* @param string $directory the directory to look into
47-
* @param MessageCatalogue $catalogue the catalogue
46+
* @param string $directory The directory to look into
47+
* @param MessageCatalogue $catalogue The catalogue
4848
*/
4949
public function loadMessages($directory, MessageCatalogue $catalogue)
5050
{

‎src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
class ExceptionController
3030
{
3131
protected $twig;
32+
protected $debug;
3233

3334
/**
34-
* @var bool Show error (false) or exception (true) pages by default
35+
* @param Environment $twig
36+
* @param bool $debug Show error (false) or exception (true) pages by default
3537
*/
36-
protected $debug;
37-
3838
public function __construct(Environment $twig, $debug)
3939
{
4040
$this->twig = $twig;

‎src/Symfony/Component/ClassLoader/XcacheClassLoader.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
class XcacheClassLoader
5252
{
5353
private $prefix;
54-
55-
/**
56-
* A class loader object that implements the findFile() method.
57-
*
58-
* @var object
59-
*/
6054
private $decorated;
6155

6256
/**

‎src/Symfony/Component/Config/ConfigCacheFactory.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
*/
2323
class ConfigCacheFactory implements ConfigCacheFactoryInterface
2424
{
25-
/**
26-
* @var bool Debug flag passed to the ConfigCache
27-
*/
2825
private $debug;
2926

3027
/**

‎src/Symfony/Component/Config/Definition/ArrayNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getChildren()
8282
/**
8383
* Sets the xml remappings that should be performed.
8484
*
85-
* @param array $remappings an array of the form array(array(string, string))
85+
* @param array $remappings An array of the form array(array(string, string))
8686
*/
8787
public function setXmlRemappings(array $remappings)
8888
{

‎src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function children()
6868
/**
6969
* Sets a prototype for child nodes.
7070
*
71-
* @param string $type the type of node
71+
* @param string $type The type of node
7272
*
7373
* @return NodeDefinition
7474
*/
@@ -154,7 +154,7 @@ public function addDefaultsIfNotSet()
154154
*
155155
* This method is applicable to prototype nodes only.
156156
*
157-
* @param int|string|array|null $children the number of children|The child name|The children names to be added
157+
* @param int|string|array|null $children The number of children|The child name|The children names to be added
158158
*
159159
* @return $this
160160
*/

‎src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function arrayNode($name)
6161
/**
6262
* Creates a child scalar node.
6363
*
64-
* @param string $name the name of the node
64+
* @param string $name The name of the node
6565
*
6666
* @return ScalarNodeDefinition The child node
6767
*/
@@ -85,7 +85,7 @@ public function booleanNode($name)
8585
/**
8686
* Creates a child integer node.
8787
*
88-
* @param string $name the name of the node
88+
* @param string $name The name of the node
8989
*
9090
* @return IntegerNodeDefinition The child node
9191
*/
@@ -97,7 +97,7 @@ public function integerNode($name)
9797
/**
9898
* Creates a child float node.
9999
*
100-
* @param string $name the name of the node
100+
* @param string $name The name of the node
101101
*
102102
* @return FloatNodeDefinition The child node
103103
*/

‎src/Symfony/Component/Console/ConsoleEvents.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ final class ConsoleEvents
2424
* before they are handled to the command.
2525
*
2626
* @Event("Symfony\Component\Console\Event\ConsoleCommandEvent")
27-
*
28-
* @var string
2927
*/
3028
const COMMAND = 'console.command';
3129

@@ -34,8 +32,6 @@ final class ConsoleEvents
3432
* executed by the console.
3533
*
3634
* @Event("Symfony\Component\Console\Event\ConsoleTerminateEvent")
37-
*
38-
* @var string
3935
*/
4036
const TERMINATE = 'console.terminate';
4137

@@ -48,8 +44,6 @@ final class ConsoleEvents
4844
*
4945
* @Event("Symfony\Component\Console\Event\ConsoleExceptionEvent")
5046
*
51-
* @var string
52-
*
5347
* @deprecated The console.exception event is deprecated since version 3.3 and will be removed in 4.0. Use the console.error event instead.
5448
*/
5549
const EXCEPTION = 'console.exception';
@@ -61,8 +55,6 @@ final class ConsoleEvents
6155
* to modify the thrown exception.
6256
*
6357
* @Event("Symfony\Component\Console\Event\ConsoleErrorEvent")
64-
*
65-
* @var string
6658
*/
6759
const ERROR = 'console.error';
6860
}

‎src/Symfony/Component/Console/Event/ConsoleCommandEvent.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class ConsoleCommandEvent extends ConsoleEvent
2525

2626
/**
2727
* Indicates if the command should be run or skipped.
28-
*
29-
* @var bool
3028
*/
3129
private $commandShouldRun = true;
3230

‎src/Symfony/Component/Console/Helper/ProgressBar.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,13 @@
2424
*/
2525
final class ProgressBar
2626
{
27-
// options
2827
private $barWidth = 28;
2928
private $barChar;
3029
private $emptyBarChar = '-';
3130
private $progressChar = '>';
3231
private $format;
3332
private $internalFormat;
3433
private $redrawFreq = 1;
35-
36-
/**
37-
* @var OutputInterface
38-
*/
3934
private $output;
4035
private $step = 0;
4136
private $max;

‎src/Symfony/Component/Console/Input/InputDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public function hasShortcut($name)
306306
/**
307307
* Gets an InputOption by shortcut.
308308
*
309-
* @param string $shortcut the Shortcut name
309+
* @param string $shortcut The Shortcut name
310310
*
311311
* @return InputOption An InputOption object
312312
*/

‎src/Symfony/Component/Console/Output/BufferedOutput.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
*/
1717
class BufferedOutput extends Output
1818
{
19-
/**
20-
* @var string
21-
*/
2219
private $buffer = '';
2320

2421
/**

‎src/Symfony/Component/Console/Output/ConsoleOutput.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
*/
3030
class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
3131
{
32-
/**
33-
* @var StreamOutput
34-
*/
3532
private $stderr;
3633

3734
/**

‎src/Symfony/Component/CssSelector/Node/ElementNode.php

Lines changed: 0 additions & 7 deletions
389D
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@
2323
*/
2424
class ElementNode extends AbstractNode
2525
{
26-
/**
27-
* @var string|null
28-
*/
2926
private $namespace;
30-
31-
/**
32-
* @var string|null
33-
*/
3427
private $element;
3528

3629
/**

0 commit comments

Comments
 (0)
0