Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 4bcf910

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/3342' into develop
Forward port zendframework/zendframework#3342 Conflicts: library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/File/Transfer/Adapter/Http.php library/Zend/File/Transfer/Transfer.php library/Zend/Http/Cookies.php library/Zend/Soap/Client.php library/Zend/Soap/Wsdl.php library/Zend/Stdlib/ErrorHandler.php library/Zend/Stdlib/Hydrator/ClassMethods.php library/Zend/Validator/File/Count.php library/Zend/Validator/File/Crc32.php library/Zend/Validator/File/ExcludeExtension.php library/Zend/Validator/File/ExcludeMimeType.php library/Zend/Validator/File/Exists.php library/Zend/Validator/File/Extension.php library/Zend/Validator/File/FilesSize.php library/Zend/Validator/File/Hash.php library/Zend/Validator/File/ImageSize.php library/Zend/Validator/File/Md5.php library/Zend/Validator/File/MimeType.php library/Zend/Validator/File/NotExists.php library/Zend/Validator/File/Sha1.php library/Zend/Validator/File/Size.php library/Zend/Validator/File/Upload.php library/Zend/Validator/File/WordCount.php tests/ZendTest/Validator/File/FilesSizeTest.php
111 parents e45137d + a0078e6 + 9db875b + 2879406 + 9acc850 + eddeb7d + 6de3f68 + cb8f354 + 5a77057 + 33c15ff + 9f13ebf + a2ad2a5 + c0ba21c + 94e82a8 + 459f1f9 + e0c8424 + 5ef6a39 + 58fd018 + 65e3b0b + d21655a + 1d20fd1 + fe81bc5 + 96fadae + 072c64d + d3c9780 + 9c15ae8 + 66a4342 + 85c9491 + 8ec8384 + 004366f + 55a086d + ac7c7af + f02a226 + 00c4ac3 + 3f52720 + 5508474 + 49ed2f6 + d562686 + 67b42b2 + bdb1dae + 9809630 + 7304e37 + 752a5af + 8181c8f + 53bdac2 + c2f9414 + f6341e9 + 57cde95 + c750616 + 293054e + 7432649 + 63f13f6 + 927c00d + 44e0d4b + bc03833 + 1fd7c61 + de0cb77 + 66e902f + 24354dc + 9f886a2 + 845333c + 96e9a1e + 52fbeb6 + 7f76d90 + fec4cec + 24efdcc + 219c9ad + 3025666 + 17d48b4 + 00f4506 + 0800032 + fc89677 + e89d79b + f329014 + a1bfde3 + 7dec05c + 734f9f2 + 2756031 + 408f714 + fd53447 + 0568c55 + d7f0623 + 8b4896f + 2f83acc + a44d7dd + 6bce797 + 6ad2b62 + 1e41fbd + f1f6e0d + e193ac7 + dad06c3 + 03ab3c8 + d0b9eec + e47995d + c3c240a + ec1f916 + 2a6a1c0 + 5f9ff12 + 475468e + 469df67 + 5f066d8 + 651bad3 + 3b98fd7 + 3bbb3b0 + 97b5e72 + 9399f4e + f0311bd + c65fe27 + 8353a14 + f3a0ed3 + 97b9752 commit 4bcf910

File tree

16 files changed

+44
-44
lines changed

16 files changed

+44
-44
lines changed

‎src/Client.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ public function getCookies()
462462
* Get the cookie Id (name+domain+path)
463463
*
464464
* @param Header\SetCookie|Header\Cookie $cookie
465-
* @return string|boolean
465+
* @return string|bool
466466
*/
467467
protected function getCookieId($cookie)
468468
{
@@ -480,8 +480,8 @@ protected function getCookieId($cookie)
480480
* @param string $expire
481481
* @param string $path
482482
* @param string $domain
483-
* @param boolean $secure
484-
* @param boolean $httponly
483+
* @param bool $secure
484+
* @param bool $httponly
485485
* @param string $maxAge
486486
* @param string $version
487487
* @throws Exception\InvalidArgumentException
@@ -561,7 +561,7 @@ public function setHeaders($headers)
561561
* Check if exists the header type specified
562562
*
563563
* @param string $name
564-
* @return boolean
564+
* @return bool
565565
*/
566566
public function hasHeader($name)
567567
{
@@ -578,7 +578,7 @@ public function hasHeader($name)
578578
* Get the header value of the request
579579
*
580580
* @param string $name
581-
* @return string|boolean
581+
* @return string|bool
582582
*/
583583
public function getHeader($name)
584584
{
@@ -595,7 +595,7 @@ public function getHeader($name)
595595
/**
596596
* Set streaming for received data
597597
*
598-
* @param string|boolean $streamfile Stream file, true for temp file, false/null for no streaming
598+
* @param string|bool $streamfile Stream file, true for temp file, false/null for no streaming
599599
* @return \Zend\Http\Client
600600
*/
601601
public function setStream($streamfile = true)
@@ -606,7 +606,7 @@ public function setStream($streamfile = true)
606606

607607
/**
608608
* Get status of streaming for received data
609-
* @return boolean|string
609+
* @return bool|string
610610
*/
611611
public function getStream()
612612
{
@@ -687,7 +687,7 @@ public function setAuth($user, $password, $type = self::AUTH_BASIC)
687687
* @param array $digest
688688
* @param null|string $entityBody
689689
* @throws Exception\InvalidArgumentException
690-
* @return string|boolean
690+
* @return string|bool
691691
*/
692692
protected function calcAuthDigest($user, $password, $type = self::AUTH_BASIC, $digest = array(), $entityBody = null)
693693
{
@@ -991,7 +991,7 @@ public function setFileUpload($filename, $formname, $data = null, $ctype = null)
991991
* Remove a file to upload
992992
*
993993
* @param string $filename
994-
* @return boolean
994+
* @return bool
995995
*/
996996
public function removeFileUpload($filename)
997997
{
@@ -1009,7 +1009,7 @@ public function removeFileUpload($filename)
10091009
* @param string $domain
10101010
* @param string $path
10111011
* @param boolean $secure
1012-
* @return Header\Cookie|boolean
1012+
* @return Header\Cookie|bool
10131013
*/
10141014
protected function prepareCookies($domain, $path, $secure)
10151015
{
@@ -1303,7 +1303,7 @@ protected function flattenParametersArray($parray, $prefix = null)
13031303
*
13041304
* @param Http $uri
13051305
* @param string $method
1306-
* @param boolean $secure
1306+
* @param bool $secure
13071307
* @param array $headers
13081308
* @param string $body
13091309
* @return string the raw response

‎src/Client/Adapter/AdapterInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function setOptions($options = array());
3434
*
3535
* @param string $host
3636
* @param int $port
37-
* @param boolean $secure
37+
* @param bool $secure
3838
*/
3939
public function connect($host, $port = 80, $secure = false);
4040

‎src/Client/Adapter/Curl.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function setCurlOption($option, $value)
178178
*
179179
* @param string $host
180180
* @param int $port
181-
* @param boolean $secure
181+
* @param bool $secure
182182
* @return void
183183
* @throws AdapterException\RuntimeException if unable to connect
184184
*/

‎src/Client/Adapter/Proxy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Proxy extends Socket
5454
/**
5555
* Whether HTTPS CONNECT was already negotiated with the proxy or not
5656
*
57-
* @var boolean
57+
* @var bool
5858
*/
5959
protected $negotiated = false;
6060

@@ -84,7 +84,7 @@ public function setOptions($options = array())
8484
*
8585
* @param string $host
8686
* @param int $port
87-
* @param boolean $secure
87+
* @param bool $secure
8888
* @throws AdapterException\RuntimeException
8989
*/
9090
public function connect($host, $port = 80, $secure = false)

‎src/Client/Adapter/Socket.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function getStreamContext()
183183
*
184184
* @param string $host
185185
* @param int $port
186-
* @param boolean $secure
186+
* @param bool $secure
187187
* @throws AdapterException\RuntimeException
188188
*/
189189
public function connect($host, $port = 80, $secure = false)

‎src/Client/Adapter/Test.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Test implements AdapterInterface
5353
/**
5454
* Whether or not the next request will fail with an exception
5555
*
56-
* @var boolean
56+
* @var bool
5757
*/
5858
protected $nextRequestWillFail = false;
5959

@@ -66,7 +66,7 @@ public function __construct()
6666
/**
6767
* Set the nextRequestWillFail flag
6868
*
69-
* @param boolean $flag
69+
* @param bool $flag
7070
* @return \Zend\Http\Client\Adapter\Test
7171
*/
7272
public function setNextRequestWillFail($flag)
@@ -105,7 +105,7 @@ public function setOptions($options = array())
105105
*
106106
* @param string $host
107107
* @param int $port
108-
* @param boolean $secure
108+
* @param bool $secure
109109
* @param int $timeout
110110
* @throws Exception\RuntimeException
111111
*/

‎src/Client/Cookies.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function getAllCookies($ret_as = self::COOKIE_OBJECT)
153153
* checking cookie expiry time.
154154
*
155155
* @param string|Uri\Uri $uri URI to check against (secure, domain, path)
156-
* @param boolean $matchSessionCookies Whether to send session cookies
156+
* @param bool $matchSessionCookies Whether to send session cookies
157157
* @param int $ret_as Whether to return cookies as objects of \Zend\Http\Header\Cookie or as strings
158158
* @param int $now Override the current time when checking for expiry time
159159
* @throws Exception\InvalidArgumentException if invalid URI
@@ -390,7 +390,7 @@ public function reset()
390390
* @param mixed $offset <p>
391391
* An offset to check for.
392392
* </p>
393-
* @return boolean Returns true on success or false on failure.
393+
* @return bool Returns true on success or false on failure.
394394
* </p>
395395
* <p>
396396
* The return value will be casted to boolean if non-boolean was returned.

‎src/ClientStatic.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected static function getStaticClient()
4343
* @param array $query
4444
* @param array $headers
4545
* @param mixed $body
46-
* @return Response|boolean
46+
* @return Response|bool
4747
*/
4848
public static function get($url, $query = array(), $headers = array(), $body = null)
4949
{
@@ -78,7 +78,7 @@ public static function get($url, $query = array(), $headers = array(), $body = n
7878
* @param array $headers
7979
* @param mixed $body
8080
* @throws Exception\InvalidArgumentException
81-
* @return Response|boolean
81+
* @return Response|bool
8282
*/
8383
public static function post($url, $params, $headers = array(), $body = null)
8484
{

‎src/Cookies.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public function getAllCookies($ret_as = self::COOKIE_OBJECT)
159159
* checking cookie expiry time.
160160
*
161161
* @param string|Uri\Uri $uri URI to check against (secure, domain, path)
162-
* @param boolean $matchSessionCookies Whether to send session cookies
163-
* @param int $ret_as Whether to return cookies as objects of \Zend\Http\Header\SetCookie or as strings
162+
* @param bool $matchSessionCookies Whether to send session cookies
163+
* @param int $ret_as Whether to return cookies as objects of \Zend\Http\Header\Cookie or as strings
164164
* @param int $now Override the current time when checking for expiry time
165165
* @throws Exception\InvalidArgumentException if invalid URI specified
166166
* @return array|string

‎src/Header/AbstractAccept.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ protected function hasType($matchAgainst)
293293
* Match a media string against this header
294294
*
295295
* @param array|string $matchAgainst
296-
* @return AcceptFieldValuePart|boolean The matched value or false
296+
* @return AcceptFieldValuePart|bool The matched value or false
297297
*/
298298
public function match($matchAgainst)
299299
{
@@ -337,7 +337,7 @@ public function match($matchAgainst)
337337
*
338338
* @param array $match1
339339
* @param array $match2
340-
* @return boolean|array
340+
* @return bool|array
341341
*/
342342
protected function matchAcceptParams($match1, $match2)
343343
{

0 commit comments

Comments
 (0)