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
symfony · Apr 16, 2014 · eca9843 · eca9843
2 parents 70b3e07 + eb06722
commit eca9843
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/CacheWarmer/RouterCacheWarmer.php b/CacheWarmer/RouterCacheWarmer.php
@@ -49,7 +49,7 @@ public function warmUp($cacheDir)
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return Boolean always true
+     * @return bool    always true
      */
     public function isOptional()
     {

diff --git a/CacheWarmer/TemplatePathsCacheWarmer.php b/CacheWarmer/TemplatePathsCacheWarmer.php
@@ -55,7 +55,7 @@ public function warmUp($cacheDir)
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return Boolean always true
+     * @return bool    always true
      */
     public function isOptional()
     {

diff --git a/Console/Application.php b/Console/Application.php
@@ -63,7 +63,7 @@ public function getKernel()
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return integer 0 if everything went fine, or an error code
+     * @return int     0 if everything went fine, or an error code
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {

diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -255,7 +255,7 @@ public function getUser()
      *
      * @param string $id The service id
      *
-     * @return Boolean true if the service id is defined, false otherwise
+     * @return bool    true if the service id is defined, false otherwise
      */
     public function has($id)
     {

diff --git a/Templating/GlobalVariables.php b/Templating/GlobalVariables.php
@@ -108,7 +108,7 @@ public function getEnvironment()
     /**
      * Returns the current app debug mode.
      *
-     * @return Boolean The current debug mode
+     * @return bool    The current debug mode
      */
     public function getDebug()
     {