Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 6605c7150233e90ba8bf582c66ecdf67af2596ed 2 parents bb40f3d + d155b2a
Fabien Potencier authored April 16, 2014
6  Cookie.php
@@ -297,7 +297,7 @@ public function getDomain()
@@ -309,7 +309,7 @@ public function isSecure()
@@ -321,7 +321,7 @@ public function isHttpOnly()
2  History.php
@@ -45,7 +45,7 @@ public function add(Request $request)
45 45
     /**
46 46
      * Returns true if the history is empty.
47 47
      *
48  
-     * @return Boolean true if the history is empty, false otherwise
  48
+     * @return bool    true if the history is empty, false otherwise
49 49
      */
50 50
     public function isEmpty()
51 51
     {
2  Response.php
@@ -92,7 +92,7 @@ public function getContent()
92 92
     /**
93 93
      * Gets the response status code.
94 94
      *
95  
-     * @return integer The response status code
  95
+     * @return int     The response status code
96 96
      *
97 97
      * @api
98 98
      */

0 notes on commit 6605c71

Please sign in to comment.
Something went wrong with that request. Please try again.