Permalink
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php
  • Loading branch information...
2 parents c84d9e3 + b8e0239 commit a3af8294bcce4a7c1b2892363b0c9d8109affad4 @fabpot fabpot committed Apr 16, 2014
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 a3af829

Please sign in to comment.