Completed
Pull Request — 2.5 (#7639)
by
unknown
03:04
created
lib/Doctrine/ORM/Configuration.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
     /**
92 92
      * Sets the strategy for automatically generating proxy classes.
93 93
      *
94
-     * @param boolean|int $autoGenerate Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
94
+     * @param boolean $autoGenerate Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
95 95
      *                                  True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
96 96
      *
97 97
      * @return void
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/NamingStrategy.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,6 @@
 block discarded – undo
70 70
      * Returns a join column name for a property.
71 71
      *
72 72
      * @param string $propertyName A property name.
73
-     * @param string|null $className    The fully-qualified class name.
74
-     *                                  This parameter is omitted from the signature due to BC
75 73
      *
76 74
      * @return string A join column name.
77 75
      */
Please login to merge, or discard this patch.
lib/Doctrine/ORM/NativeQuery.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     /**
50 50
      * Gets the SQL query.
51 51
      *
52
-     * @return mixed The built SQL query or an array of all SQL queries.
52
+     * @return string The built SQL query or an array of all SQL queries.
53 53
      *
54 54
      * @override
55 55
      */
Please login to merge, or discard this patch.
lib/Doctrine/ORM/PersistentCollection.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -579,7 +579,7 @@
 block discarded – undo
579 579
      * Internal note: Tried to implement Serializable first but that did not work well
580 580
      *                with circular references. This solution seems simpler and works well.
581 581
      *
582
-     * @return array
582
+     * @return string[]
583 583
      */
584 584
     public function __sleep()
585 585
     {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Proxy/ProxyFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
      * @param EntityManagerInterface $em           The EntityManager the new factory works for.
70 70
      * @param string                 $proxyDir     The directory to use for the proxy classes. It must exist.
71 71
      * @param string                 $proxyNs      The namespace to use for the proxy classes.
72
-     * @param boolean|int            $autoGenerate The strategy for automatically generating proxy classes. Possible
72
+     * @param integer            $autoGenerate The strategy for automatically generating proxy classes. Possible
73 73
      *                                             values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
74 74
      */
75 75
     public function __construct(EntityManagerInterface $em, $proxyDir, $proxyNs, $autoGenerate = AbstractProxyFactory::AUTOGENERATE_NEVER)
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Parser.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
      * declarations (from ... x join ... y join ... z ...) appear in the query
413 413
      * as the hydration process relies on that order for proper operation.
414 414
      *
415
-     * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST
415
+     * @param AST\SelectStatement $AST
416 416
      *
417 417
      * @return void
418 418
      */
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
      * SingleValuedAssociationPathExpression ::= IdentificationVariable "." SingleValuedAssociationField
749 749
      * CollectionValuedPathExpression        ::= IdentificationVariable "." CollectionValuedAssociationField
750 750
      *
751
-     * @param mixed $AST
751
+     * @param AST\SelectStatement $AST
752 752
      *
753 753
      * @return void
754 754
      */
@@ -1622,7 +1622,7 @@  discard block
 block discarded – undo
1622 1622
      * accessible is "FROM", prohibiting an easy implementation without larger
1623 1623
      * changes.}
1624 1624
      *
1625
-     * @return \Doctrine\ORM\Query\AST\SubselectIdentificationVariableDeclaration |
1625
+     * @return AST\IdentificationVariableDeclaration |
1626 1626
      *         \Doctrine\ORM\Query\AST\IdentificationVariableDeclaration
1627 1627
      */
1628 1628
     public function SubselectIdentificationVariableDeclaration()
@@ -1760,7 +1760,7 @@  discard block
 block discarded – undo
1760 1760
     /**
1761 1761
      * JoinAssociationDeclaration ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy]
1762 1762
      *
1763
-     * @return \Doctrine\ORM\Query\AST\JoinAssociationPathExpression
1763
+     * @return AST\JoinAssociationDeclaration
1764 1764
      */
1765 1765
     public function JoinAssociationDeclaration()
1766 1766
     {
@@ -1798,7 +1798,7 @@  discard block
 block discarded – undo
1798 1798
      * PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet
1799 1799
      * PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}"
1800 1800
      *
1801
-     * @return array
1801
+     * @return AST\PartialObjectExpression
1802 1802
      */
1803 1803
     public function PartialObjectExpression()
1804 1804
     {
@@ -2877,7 +2877,7 @@  discard block
 block discarded – undo
2877 2877
     /**
2878 2878
      * StringExpression ::= StringPrimary | ResultVariable | "(" Subselect ")"
2879 2879
      *
2880
-     * @return \Doctrine\ORM\Query\AST\StringPrimary |
2880
+     * @return null|AST\Node |
2881 2881
      *         \Doctrine\ORM\Query\AST\Subselect |
2882 2882
      *         string
2883 2883
      */
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/SqlWalker.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -1529,6 +1529,7 @@
 block discarded – undo
1529 1529
 
1530 1530
     /**
1531 1531
      * @param AST\NewObjectExpression $newObjectExpression
1532
+     * @param string $newObjectResultAlias
1532 1533
      *
1533 1534
      * @return string The SQL.
1534 1535
      */
Please login to merge, or discard this patch.
lib/Doctrine/ORM/UnitOfWork.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3321,7 +3321,7 @@
 block discarded – undo
3321 3321
     /**
3322 3322
      * Verifies if two given entities actually are the same based on identifier comparison
3323 3323
      *
3324
-     * @param object $entity1
3324
+     * @param Proxy $entity1
3325 3325
      * @param object $entity2
3326 3326
      *
3327 3327
      * @return bool
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
     /**
108 108
      * Initiates a row-by-row hydration.
109 109
      *
110
-     * @param object $stmt
111
-     * @param object $resultSetMapping
110
+     * @param \Doctrine\DBAL\Driver\Statement $stmt
111
+     * @param \Doctrine\ORM\Query\ResultSetMapping $resultSetMapping
112 112
      * @param array  $hints
113 113
      *
114 114
      * @return IterableResult
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
     /**
132 132
      * Hydrates all rows returned by the passed statement instance at once.
133 133
      *
134
-     * @param object $stmt
135
-     * @param object $resultSetMapping
134
+     * @param \Doctrine\DBAL\Driver\Statement $stmt
135
+     * @param \Doctrine\ORM\Query\ResultSetMapping $resultSetMapping
136 136
      * @param array  $hints
137 137
      *
138 138
      * @return array
Please login to merge, or discard this patch.