Skip to content

Commit fcab8eb

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Intl] Make intl-data tests pass and save language aliases again Remove useless docblocks
2 parents 361db1e + db77426 commit fcab8eb

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

Compiler/RepeatedPass.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class RepeatedPass implements CompilerPassInterface
2626
*/
2727
private $repeat = false;
2828

29-
/**
30-
* @var RepeatablePassInterface[]
31-
*/
3229
private $passes;
3330

3431
/**

ContainerBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function __construct(ParameterBagInterface $parameterBag = null)
109109
* If you are not using the loaders and therefore don't want
110110
* to depend on the Config component, set this flag to false.
111111
*
112-
* @param bool $track true if you want to track resources, false otherwise
112+
* @param bool $track True if you want to track resources, false otherwise
113113
*/
114114
public function setResourceTracking($track)
115115
{
@@ -119,7 +119,7 @@ public function setResourceTracking($track)
119119
/**
120120
* Checks if resources are tracked.
121121
*
122-
* @return bool true if resources are tracked, false otherwise
122+
* @return bool true If resources are tracked, false otherwise
123123
*/
124124
public function isTrackingResources()
125125
{

Dumper/PhpDumper.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,11 @@ class PhpDumper extends Dumper
3838
{
3939
/**
4040
* Characters that might appear in the generated variable name as first character.
41-
*
42-
* @var string
4341
*/
4442
const FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz';
4543

4644
/**
4745
* Characters that might appear in the generated variable name as any but the first character.
48-
*
49-
* @var string
5046
*/
5147
const NON_FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_';
5248

LazyProxy/Instantiator/InstantiatorInterface.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ interface InstantiatorInterface
2525
/**
2626
* Instantiates a proxy object.
2727
*
28-
* @param ContainerInterface $container the container from which the service is being requested
29-
* @param Definition $definition the definition of the requested service
30-
* @param string $id identifier of the requested service
31-
* @param callable $realInstantiator zero-argument callback that is capable of producing the real
32-
* service instance
28+
* @param ContainerInterface $container The container from which the service is being requested
29+
* @param Definition $definition The definition of the requested service
30+
* @param string $id Identifier of the requested service
31+
* @param callable $realInstantiator Zero-argument callback that is capable of producing the real service instance
3332
*
3433
* @return object
3534
*/

LazyProxy/PhpDumper/DumperInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function isProxyCandidate(Definition $definition);
3131
* Generates the code to be used to instantiate a proxy in the dumped factory code.
3232
*
3333
* @param Definition $definition
34-
* @param string $id service identifier
34+
* @param string $id Service identifier
3535
*
3636
* @return string
3737
*/

0 commit comments

Comments
 (0)