Merge branch '2.4' into 2.5

fabpot · fabpot · commit 12a6ccbca008 · 2014-08-26T16:16:33.000+02:00
* 2.4: [DependencyInjection] fix @return anno created by PhpDumper Fixed the phpdoc of the VoterInterface [DoctrineBridge] Fix empty parameter logging in the dbal logger Fixed #11675 ValueToDuplicatesTransformer accept "0" value check for the correct field type fix handling of nullable XML attributes [DomCrawler] fix the axes handling in a bc way Conflicts: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
diff --git a/Core/Authorization/Voter/VoterInterface.php b/Core/Authorization/Voter/VoterInterface.php
@@ -49,7 +49,7 @@ public function supportsClass($class);
      * ACCESS_GRANTED, ACCESS_DENIED, or ACCESS_ABSTAIN.
      *
      * @param TokenInterface $token      A TokenInterface instance
-     * @param object         $object     The object to secure
+     * @param object|null    $object     The object to secure
      * @param array          $attributes An array of attributes associated with the method being invoked
      *
      * @return int     either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function supportsClass($class);`
`49`	`49`	`* ACCESS_GRANTED, ACCESS_DENIED, or ACCESS_ABSTAIN.`
`50`	`50`	`*`
`51`	`51`	`* @param TokenInterface $token A TokenInterface instance`
`52`		`- * @param object $object The object to secure`
	`52`	`+ * @param object\|null $object The object to secure`
`53`	`53`	`* @param array $attributes An array of attributes associated with the method being invoked`
`54`	`54`	`*`
`55`	`55`	`* @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED`