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

Commit af23c99

Browse files
weierophinneyweierophinney
committed
Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2 
80 parents b1e5a28 + ece1d99 + 0b9ced2 + 9d50bff + 476d115 + c660c64 + 23e480a + 2d1a86f + bcd3a85 + d46ca8d + 236d691 + 0c0ae53 + 16da5d7 + 1c4489e + a57bb3d + c14d67b + b241e8d + 10c9e19 + 33f9f3b + 4585cfe + d06b3a5 + 371eaa8 + c9fbe3f + 77552c9 + 5883d28 + 518460f + 63a6a3b + f21d820 + 5b80282 + 8d4f7c0 + 3428c24 + 50a5cf9 + 0fcf91c + ffd0e6c + 90cc750 + 4c0cba4 + 9e64972 + 3a86f54 + f4931d8 + 9c496b9 + f36d38f + 1b580df + dab01ce + bc6e247 + 96739b6 + e1b5376 + 1c7183f + 0e68ed1 + 5b3198f + 929c939 + f7e2963 + 611c83e + 1d9e7ae + eae64aa + 1f3f9e7 + b2d7401 + 2f1d9d3 + de6b908 + c73007c + 9565c63 + bc2a6d0 + 264d24f + c9c493c + 3992e0d + 5225965 + 0de9a5c + 867db21 + 34fe2aa + 6ec2723 + e576e38 + cbc0283 + d007f6e + db4f03e + f8f7897 + 4cb349f + f5287db + e7abf4a + 65a414c + 78d16a9 + 80f5165 commit af23c99

10 files changed

+28
-26
lines changed

‎src/ClassFileLocator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class ClassFileLocator extends FilterIterator
2727
{
2828
/**
2929
* Create an instance of the locator iterator
30-
*
31-
* Expects either a directory, or a DirectoryIterator (or its recursive variant)
30+
*
31+
* Expects either a directory, or a DirectoryIterator (or its recursive variant)
3232
* instance.
33-
*
33+
*
3434
* @param string|DirectoryIterator $dirOrIterator
3535
*/
3636
public function __construct($dirOrIterator = '.')

‎src/Exception/BadMethodCallException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
* @category Zend
1515
* @package Zend_File_Transfer
1616
*/
17-
class BadMethodCallException extends \BadMethodCallException implements
17+
class BadMethodCallException extends \BadMethodCallException implements
1818
ExceptionInterface
1919
{}

‎src/Exception/ExceptionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/**
1414
* Marker interface for exceptions found in this component
15-
*
15+
*
1616
* @package Zend_File
1717
* @subpackage Exception
1818
*/

‎src/Exception/InvalidArgumentException.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
/**
1414
* Exception class raised when invalid arguments are discovered
15-
*
15+
*
1616
* @package Zend_File
1717
*/
18-
class InvalidArgumentException
19-
extends \InvalidArgumentException
18+
class InvalidArgumentException
19+
extends \InvalidArgumentException
2020
implements ExceptionInterface
2121
{
2222
}

‎src/Transfer/Adapter/AbstractAdapter.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@ public function addValidators(array $validators, $files = null)
418418
foreach ($validators as $name => $validatorInfo) {
419419
if ($validatorInfo instanceof Validator\ValidatorInterface) {
420420
$this->addValidator($validatorInfo, null, null, $files);
421-
} else if (is_string($validatorInfo)) {
421+
} elseif (is_string($validatorInfo)) {
422422
if (!is_int($name)) {
423423
$this->addValidator($name, null, $validatorInfo, $files);
424424
} else {
425425
$this->addValidator($validatorInfo, null, null, $files);
426426
}
427-
} else if (is_array($validatorInfo)) {
427+
} elseif (is_array($validatorInfo)) {
428428
$argc = count($validatorInfo);
429429
$breakChainOnFailure = false;
430430
$options = array();
@@ -592,7 +592,8 @@ public function clearValidators()
592592
* @param array $options Options to set
593593
* @param array $files (Optional) Files to set the options for
594594
*/
595-
public function setOptions($options = array(), $files = null) {
595+
public function setOptions($options = array(), $files = null)
596+
{
596597
$file = $this->getFiles($files, false, true);
597598

598599
if (is_array($options)) {
@@ -629,7 +630,8 @@ public function setOptions($options = array(), $files = null) {
629630
* @param array $files (Optional) Files to return the options for
630631
* @return array Options for given files
631632
*/
632-
public function getOptions($files = null) {
633+
public function getOptions($files = null)
634+
{
633635
$file = $this->getFiles($files, false, true);
634636

635637
foreach ($file as $key => $content) {
@@ -1070,7 +1072,7 @@ public function getDestination($files = null)
10701072

10711073
if (empty($destinations)) {
10721074
$destinations = $this->getTmpDir();
1073-
} else if (count($destinations) == 1) {
1075+
} elseif (count($destinations) == 1) {
10741076
$destinations = current($destinations);
10751077
}
10761078

@@ -1144,9 +1146,9 @@ public function getHash($hash = 'crc32', $files = null)
11441146
foreach($files as $key => $value) {
11451147
if (file_exists($value['name'])) {
11461148
$result[$key] = hash_file($hash, $value['name']);
1147-
} else if (file_exists($value['tmp_name'])) {
1149+
} elseif (file_exists($value['tmp_name'])) {
11481150
$result[$key] = hash_file($hash, $value['tmp_name']);
1149-
} else if (empty($value['options']['ignoreNoFile'])) {
1151+
} elseif (empty($value['options']['ignoreNoFile'])) {
11501152
throw new Exception\InvalidArgumentException("The file '{$value['name']}' does not exist");
11511153
}
11521154
}
@@ -1176,7 +1178,7 @@ public function getFileSize($files = null)
11761178
} else {
11771179
$result[$key] = $value['size'];
11781180
}
1179-
} else if (empty($value['options']['ignoreNoFile'])) {
1181+
} elseif (empty($value['options']['ignoreNoFile'])) {
11801182
throw new Exception\InvalidArgumentException("The file '{$value['name']}' does not exist");
11811183
} else {
11821184
continue;
@@ -1200,7 +1202,7 @@ protected function detectFileSize($value)
12001202
{
12011203
if (file_exists($value['name'])) {
12021204
$result = sprintf("%u", @filesize($value['name']));
1203-
} else if (file_exists($value['tmp_name'])) {
1205+
} elseif (file_exists($value['tmp_name'])) {
12041206
$result = sprintf("%u", @filesize($value['tmp_name']));
12051207
} else {
12061208
return null;
@@ -1224,7 +1226,7 @@ public function getMimeType($files = null)
12241226
foreach($files as $key => $value) {
12251227
if (file_exists($value['name']) || file_exists($value['tmp_name'])) {
12261228
$result[$key] = $value['type'];
1227-
} else if (empty($value['options']['ignoreNoFile'])) {
1229+
} elseif (empty($value['options']['ignoreNoFile'])) {
12281230
throw new Exception\InvalidArgumentException("the file '{$value['name']}' does not exist");
12291231
} else {
12301232
continue;
@@ -1248,7 +1250,7 @@ protected function detectMimeType($value)
12481250
{
12491251
if (file_exists($value['name'])) {
12501252
$file = $value['name'];
1251-
} else if (file_exists($value['tmp_name'])) {
1253+
} elseif (file_exists($value['tmp_name'])) {
12521254
$file = $value['tmp_name'];
12531255
} else {
12541256
return null;

‎src/Transfer/Adapter/Http.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function isValid($files = null)
107107
$content = 0;
108108
if (isset($_SERVER['CONTENT_LENGTH'])) {
109109
$content = $_SERVER['CONTENT_LENGTH'];
110-
} else if (!empty($_POST)) {
110+
} elseif (!empty($_POST)) {
111111
$content = serialize($_POST);
112112
}
113113

@@ -339,7 +339,7 @@ public static function getProgress($id = null)
339339
if (is_array($call)) {
340340
$status = $call + $status;
341341
}
342-
} else if (self::isUploadProgressAvailable()) {
342+
} elseif (self::isUploadProgressAvailable()) {
343343
$call = call_user_func(self::$callbackUploadProgress, $id);
344344
if (is_array($call)) {
345345
$status = $call + $status;
@@ -355,7 +355,7 @@ public static function getProgress($id = null)
355355
if (!is_array($call)) {
356356
$status['done'] = true;
357357
$status['message'] = 'Failure while retrieving the upload progress';
358-
} else if (!empty($status['cancel_upload'])) {
358+
} elseif (!empty($status['cancel_upload'])) {
359359
$status['done'] = true;
360360
$status['message'] = 'The upload has been canceled';
361361
} else {

‎src/Transfer/Exception/BadMethodCallException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
* @category Zend
1717
* @package Zend_File_Transfer
1818
*/
19-
class BadMethodCallException extends Exception\BadMethodCallException implements
19+
class BadMethodCallException extends Exception\BadMethodCallException implements
2020
ExceptionInterface
2121
{}

‎src/Transfer/Exception/InvalidArgumentException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
* @category Zend
1717
* @package Zend_File_Transfer
1818
*/
19-
class InvalidArgumentException extends Exception\InvalidArgumentException implements
19+
class InvalidArgumentException extends Exception\InvalidArgumentException implements
2020
ExceptionInterface
2121
{}

‎src/Transfer/Exception/RuntimeException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
* @category Zend
1717
* @package Zend_File_Transfer
1818
*/
19-
class RuntimeException extends Exception\RuntimeException implements
19+
class RuntimeException extends Exception\RuntimeException implements
2020
ExceptionInterface
2121
{}

‎src/Transfer/Transfer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function setAdapter($adapter, $direction = false, $options = array())
5252
if (!is_string($adapter)) {
5353
throw new Exception\InvalidArgumentException('Adapter must be a string');
5454
}
55-
55+
5656
if ($adapter[0] != '\\') {
5757
$adapter = '\Zend\File\Transfer\Adapter\\' . ucfirst($adapter);
5858
}

0 commit comments

Comments
 (0)