Permalink
Browse files

Merge branch '2.4'

* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
  • Loading branch information...
fabpot committed Apr 16, 2014
2 parents f395f96 + a3af829 commit 98e831eac836a0a5911626ce82684155f21d0e4d
Showing with 2 additions and 2 deletions.
  1. +2 −2 Filesystem.php
View
@@ -90,7 +90,7 @@ public function mkdir($dirs, $mode = 0777)
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
*
- * @return Boolean true if the file exists, false otherwise
+ * @return bool true if the file exists, false otherwise
*/
public function exists($files)
{
@@ -413,7 +413,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
*
* @param string $file A file path
*
- * @return Boolean
+ * @return bool
*/
public function isAbsolutePath($file)
{

0 comments on commit 98e831e

Please sign in to comment.