Thanks to visit codestin.com
Credit goes to github.com

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

Commit 84513b1

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
87 parents 36ec756 + 5f2adec + 7674ec8 + 2200ed2 + f033c86 + d43a2da + 4434323 + 88b21e1 + b02b602 + b692de7 + 7f833d2 + 2eaf4da + a7848de + 5bd9f85 + d7a26e8 + 173f53d + bd77e8e + 45f017e + 118612c + 3a09f79 + 47d92bc + dbf56ad + a753b61 + 6467186 + 5ac4124 + 2bf68ca + e7cd709 + 7a552db + f112e0c + cec42fc + 066eb37 + 3569d8b + 00def10 + ecae47b + 0e552a5 + 4f854c2 + 2b17650 + c1c0447 + 73b1f80 + dd4a335 + a40eb42 + 9262db1 + bdbd950 + 6d50117 + 10b08a7 + f692a0d + ebe63d3 + 528260b + 5f04a7f + c0dcd12 + 224f280 + 8785f25 + 866539b + d711927 + e280213 + 002f0d4 + 5ffcbbe + 8937705 + 5803840 + 3d7cd9a + 6b14f0e + 24bd169 + 0eba870 + 4e4acfe + 9e243bd + e156354 + 2a84563 + 3f1f758 + 4e425f4 + 7030f97 + ea08a0f + 213ebd9 + f6dc9f4 + ce7ad56 + c32267b + 07e1aab + 886d9b6 + 7893e57 + 5a59fe0 + 3e0fb0f + 7fc2802 + 24afec9 + b634f09 + 10a3140 + 65ac44e + 5d80740 + 3749180 commit 84513b1

55 files changed

Lines changed: 137 additions & 137 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/AbstractValidator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function getMessages()
171171
* Invoke as command
172172
*
173173
* @param mixed $value
174-
* @return boolean
174+
* @return bool
175175
*/
176176
public function __invoke($value)
177177
{
@@ -499,7 +499,7 @@ public static function getDefaultTranslator()
499499
/**
500500
* Is there a default translation object set?
501501
*
502-
* @return boolean
502+
* @return bool
503503
*/
504504
public static function hasDefaultTranslator()
505505
{

‎src/Barcode.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public function getChecksum()
121121
/**
122122
* Sets if checksum should be validated, if no value is given the actual setting is returned
123123
*
124-
* @param boolean $checksum
125-
* @return boolean
124+
* @param bool $checksum
125+
* @return bool
126126
*/
127127
public function useChecksum($checksum = null)
128128
{
@@ -135,7 +135,7 @@ public function useChecksum($checksum = null)
135135
* Returns true if and only if $value contains a valid barcode
136136
*
137137
* @param string $value
138-
* @return boolean
138+
* @return bool
139139
*/
140140
public function isValid($value)
141141
{

‎src/Barcode/AbstractAdapter.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ abstract class AbstractAdapter implements AdapterInterface
3131
* Checks the length of a barcode
3232
*
3333
* @param string $value The barcode to check for proper length
34-
* @return boolean
34+
* @return bool
3535
*/
3636
public function hasValidLength($value)
3737
{
@@ -71,7 +71,7 @@ public function hasValidLength($value)
7171
* Checks for allowed characters within the barcode
7272
*
7373
* @param string $value The barcode to check for allowed characters
74-
* @return boolean
74+
* @return bool
7575
*/
7676
public function hasValidCharacters($value)
7777
{
@@ -102,7 +102,7 @@ public function hasValidCharacters($value)
102102
* Validates the checksum
103103
*
104104
* @param string $value The barcode to check the checksum for
105-
* @return boolean
105+
* @return bool
106106
*/
107107
public function hasValidChecksum($value)
108108
{
@@ -160,16 +160,16 @@ protected function setChecksum($checksum)
160160
/**
161161
* Sets the checksum validation, if no value is given, the actual setting is returned
162162
*
163-
* @param boolean $check
164-
* @return AbstractAdapter|boolean
163+
* @param bool $check
164+
* @return AbstractAdapter|bool
165165
*/
166166
public function useChecksum($check = null)
167167
{
168168
if ($check === null) {
169169
return $this->options['useChecksum'];
170170
}
171171

172-
$this->options['useChecksum'] = (boolean) $check;
172+
$this->options['useChecksum'] = (bool) $check;
173173
return $this;
174174
}
175175

@@ -202,7 +202,7 @@ protected function setCharacters($characters)
202202
* GTIN implementation factor 3
203203
*
204204
* @param string $value The barcode to validate
205-
* @return boolean
205+
* @return bool
206206
*/
207207
protected function gtin($value)
208208
{
@@ -232,7 +232,7 @@ protected function gtin($value)
232232
* IDENTCODE implementation factors 9 and 4
233233
*
234234
* @param string $value The barcode to validate
235-
* @return boolean
235+
* @return bool
236236
*/
237237
protected function identcode($value)
238238
{
@@ -262,7 +262,7 @@ protected function identcode($value)
262262
* CODE25 implementation factor 3
263263
*
264264
* @param string $value The barcode to validate
265-
* @return boolean
265+
* @return bool
266266
*/
267267
protected function code25($value)
268268
{
@@ -292,7 +292,7 @@ protected function code25($value)
292292
* POSTNET implementation
293293
*
294294
* @param string $value The barcode to validate
295-
* @return boolean
295+
* @return bool
296296
*/
297297
protected function postnet($value)
298298
{

‎src/Barcode/AdapterInterface.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ interface AdapterInterface
2020
* Checks the length of a barcode
2121
*
2222
* @param string $value The barcode to check for proper length
23-
* @return boolean
23+
* @return bool
2424
*/
2525
public function hasValidLength($value);
2626

2727
/**
2828
* Checks for allowed characters within the barcode
2929
*
3030
* @param string $value The barcode to check for allowed characters
31-
* @return boolean
31+
* @return bool
3232
*/
3333
public function hasValidCharacters($value);
3434

3535
/**
3636
* Validates the checksum
3737
*
3838
* @param string $value The barcode to check the checksum for
39-
* @return boolean
39+
* @return bool
4040
*/
4141
public function hasValidChecksum($value);
4242

@@ -57,15 +57,15 @@ public function getCharacters();
5757
/**
5858
* Returns if barcode uses a checksum
5959
*
60-
* @return boolean
60+
* @return bool
6161
*/
6262
public function getChecksum();
6363

6464
/**
6565
* Sets the checksum validation, if no value is given, the actual setting is returned
6666
*
67-
* @param boolean $check
68-
* @return AbstractAdapter|boolean
67+
* @param bool $check
68+
* @return AbstractAdapter|bool
6969
*/
7070
public function useChecksum($check = null);
7171
}

‎src/Barcode/Code128.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct()
7676
* Checks for allowed characters within the barcode
7777
*
7878
* @param string $value The barcode to check for allowed characters
79-
* @return boolean
79+
* @return bool
8080
*/
8181
public function hasValidCharacters($value)
8282
{
@@ -164,7 +164,7 @@ public function hasValidCharacters($value)
164164
* Validates the checksum ()
165165
*
166166
* @param string $value The barcode to validate
167-
* @return boolean
167+
* @return bool
168168
*/
169169
protected function code128($value)
170170
{

‎src/Barcode/Code39.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct()
4444
* Validates the checksum (Modulo 43)
4545
*
4646
* @param string $value The barcode to validate
47-
* @return boolean
47+
* @return bool
4848
*/
4949
protected function code39($value)
5050
{

‎src/Barcode/Code93.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct()
4545
* Validates the checksum (Modulo CK)
4646
*
4747
* @param string $value The barcode to validate
48-
* @return boolean
48+
* @return bool
4949
*/
5050
protected function code93($value)
5151
{

‎src/Barcode/Ean8.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct()
3030
* Overrides parent checkLength
3131
*
3232
* @param string $value Value
33-
* @return boolean
33+
* @return bool
3434
*/
3535
public function hasValidLength($value)
3636
{

‎src/Barcode/Issn.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct()
3030
* Allows X on length of 8 chars
3131
*
3232
* @param string $value The barcode to check for allowed characters
33-
* @return boolean
33+
* @return bool
3434
*/
3535
public function hasValidCharacters($value)
3636
{
@@ -47,7 +47,7 @@ public function hasValidCharacters($value)
4747
* Validates the checksum
4848
*
4949
* @param string $value The barcode to check the checksum for
50-
* @return boolean
50+
* @return bool
5151
*/
5252
public function hasValidChecksum($value)
5353
{
@@ -65,7 +65,7 @@ public function hasValidChecksum($value)
6565
* ISSN implementation (reversed mod11)
6666
*
6767
* @param string $value The barcode to validate
68-
* @return boolean
68+
* @return bool
6969
*/
7070
protected function issn($value)
7171
{

‎src/Barcode/Royalmail.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct()
4848
* Validates the checksum ()
4949
*
5050
* @param string $value The barcode to validate
51-
* @return boolean
51+
* @return bool
5252
*/
5353
protected function royalmail($value)
5454
{
@@ -79,7 +79,7 @@ protected function royalmail($value)
7979
* Allows start and stop tag within checked chars
8080
*
8181
* @param string $value The barcode to check for allowed characters
82-
* @return boolean
82+
* @return bool
8383
*/
8484
public function hasValidCharacters($value)
8585
{

0 commit comments

Comments
 (0)