Skip to content

Commit cbbd062

Browse files
committed
minor symfony#13066 [2.3] CS And DocBlock Fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes symfony#13066). Discussion ---------- [2.3] CS And DocBlock Fixes | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A ##### This pull request provides some cs and docblock fixes. @fabpot The second commit of the two applies the docblock fixes you wanted, using PHP-CS-Fixer/PHP-CS-Fixer#887. I made 3 or 4 minor manual changes because people had put bulleted lists in the "short description" which is not allowed, so we were ending up with colons followed by full stops. I've moved those lists to be part of a "long description". // cc @keradus Commits ------- 83c15db [2.3] CS And DocBlock Fixes
2 parents ff52a9f + 83c15db commit cbbd062

File tree

452 files changed

+1137
-1029
lines changed

Some content is hidden

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

452 files changed

+1137
-1029
lines changed

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class ContainerAwareEventManager extends EventManager
2424
{
2525
/**
2626
* Map of registered listeners.
27+
*
2728
* <event> => <listeners>
2829
*
2930
* @var array

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Config\Resource\FileResource;
1717

1818
/**
19-
* Registers additional validators
19+
* Registers additional validators.
2020
*
2121
* @author Benjamin Eberlei <[email protected]>
2222
*/
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
4343

4444
/**
4545
* Gets the validation mapping files for the format and extends them with
46-
* files matching a doctrine search pattern (Resources/config/validation.orm.xml)
46+
* files matching a doctrine search pattern (Resources/config/validation.orm.xml).
4747
*
4848
* @param ContainerBuilder $container
4949
* @param string $mapping

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,31 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
3535
/**
3636
* DI object for the driver to use, either a service definition for a
3737
* private service or a reference for a public service.
38+
*
3839
* @var Definition|Reference
3940
*/
4041
protected $driver;
4142

4243
/**
43-
* List of namespaces handled by the driver
44+
* List of namespaces handled by the driver.
45+
*
4446
* @var string[]
4547
*/
4648
protected $namespaces;
4749

4850
/**
4951
* List of potential container parameters that hold the object manager name
5052
* to register the mappings with the correct metadata driver, for example
51-
* array('acme.manager', 'doctrine.default_entity_manager')
53+
* array('acme.manager', 'doctrine.default_entity_manager').
54+
*
5255
* @var string[]
5356
*/
5457
protected $managerParameters;
5558

5659
/**
5760
* Naming pattern of the metadata chain driver service ids, for example
58-
* 'doctrine.orm.%s_metadata_driver'
61+
* 'doctrine.orm.%s_metadata_driver'.
62+
*
5963
* @var string
6064
*/
6165
protected $driverPattern;
@@ -64,6 +68,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
6468
* A name for a parameter in the container. If set, this compiler pass will
6569
* only do anything if the parameter is present. (But regardless of the
6670
* value of that parameter.
71+
*
6772
* @var string
6873
*/
6974
protected $enabledParameter;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
1919

2020
/**
21-
* A choice list presenting a list of Doctrine entities as choices
21+
* A choice list presenting a list of Doctrine entities as choices.
2222
*
2323
* @author Bernhard Schussek <[email protected]>
2424
*/
@@ -41,7 +41,7 @@ class EntityChoiceList extends ObjectChoiceList
4141

4242
/**
4343
* Contains the query builder that builds the query for fetching the
44-
* entities
44+
* entities.
4545
*
4646
* This property should only be accessed through queryBuilder.
4747
*
@@ -50,21 +50,21 @@ class EntityChoiceList extends ObjectChoiceList
5050
private $entityLoader;
5151

5252
/**
53-
* The identifier field, if the identifier is not composite
53+
* The identifier field, if the identifier is not composite.
5454
*
5555
* @var array
5656
*/
5757
private $idField = null;
5858

5959
/**
60-
* Whether to use the identifier for index generation
60+
* Whether to use the identifier for index generation.
6161
*
6262
* @var bool
6363
*/
6464
private $idAsIndex = false;
6565

6666
/**
67-
* Whether to use the identifier for value generation
67+
* Whether to use the identifier for value generation.
6868
*
6969
* @var bool
7070
*/
@@ -98,7 +98,7 @@ class EntityChoiceList extends ObjectChoiceList
9898
* the choices are given as flat array.
9999
* @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths.
100100
*/
101-
public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null, PropertyAccessorInterface $propertyAccessor = null)
101+
public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null, PropertyAccessorInterface $propertyAccessor = null)
102102
{
103103
$this->em = $manager;
104104
$this->entityLoader = $entityLoader;
@@ -128,7 +128,7 @@ public function __construct(ObjectManager $manager, $class, $labelPath = null, E
128128
}
129129

130130
/**
131-
* Returns the list of entities
131+
* Returns the list of entities.
132132
*
133133
* @return array
134134
*
@@ -144,7 +144,7 @@ public function getChoices()
144144
}
145145

146146
/**
147-
* Returns the values for the entities
147+
* Returns the values for the entities.
148148
*
149149
* @return array
150150
*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
use Doctrine\ORM\EntityManager;
1818

1919
/**
20-
* Getting Entities through the ORM QueryBuilder
20+
* Getting Entities through the ORM QueryBuilder.
2121
*/
2222
class ORMQueryBuilderLoader implements EntityLoaderInterface
2323
{
2424
/**
2525
* Contains the query builder that builds the query for fetching the
26-
* entities
26+
* entities.
2727
*
2828
* This property should only be accessed through queryBuilder.
2929
*
@@ -32,7 +32,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
3232
private $queryBuilder;
3333

3434
/**
35-
* Construct an ORM Query Builder Loader
35+
* Construct an ORM Query Builder Loader.
3636
*
3737
* @param QueryBuilder|\Closure $queryBuilder
3838
* @param EntityManager $manager

src/Symfony/Bridge/Doctrine/RegistryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getDefaultEntityManagerName();
3939
public function getEntityManager($name = null);
4040

4141
/**
42-
* Gets an array of all registered entity managers
42+
* Gets an array of all registered entity managers.
4343
*
4444
* @return array An array of EntityManager instances
4545
*/

src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ class DoctrineTokenProvider implements TokenProviderInterface
3939
{
4040
/**
4141
* Doctrine DBAL database connection
42-
* F.ex. service id: doctrine.dbal.default_connection
42+
* F.ex. service id: doctrine.dbal.default_connection.
4343
*
4444
* @var \Doctrine\DBAL\Connection
4545
*/
4646
private $conn;
4747

4848
/**
49-
* new DoctrineTokenProvider for the RemembeMe authentication service
49+
* new DoctrineTokenProvider for the RemembeMe authentication service.
5050
*
5151
* @param \Doctrine\DBAL\Connection $conn
5252
*/

src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
1515

1616
/**
17-
* Class DoctrineOrmTestCase
17+
* Class DoctrineOrmTestCase.
1818
*
1919
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
2020
* Use {@link DoctrineTestHelper} instead.

src/Symfony/Bridge/Doctrine/Tests/Fixtures/AssociationEntity.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class AssociationEntity
2727

2828
/**
2929
* @ORM\ManyToOne(targetEntity="SingleIntIdEntity")
30+
*
3031
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity
3132
*/
3233
public $single;
@@ -37,6 +38,7 @@ class AssociationEntity
3738
* @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
3839
* @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
3940
* })
41+
*
4042
* @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
4143
*/
4244
public $composite;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515

1616
/**
17-
* Constraint for the Unique Entity validator
17+
* Constraint for the Unique Entity validator.
1818
*
1919
* @Annotation
2020
* @Target({"CLASS", "ANNOTATION"})

0 commit comments

Comments
 (0)