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

Commit

Permalink
Merge branch 'hotfix/4352' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/Transfer/Adapter/AbstractAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ protected function detectMimeType($value)
/**
* Returns the formatted size
*
* @param integer $size
* @param int $size
* @return string
*/
protected static function toByteString($size)
Expand Down
10 changes: 5 additions & 5 deletions src/Transfer/Adapter/FilterPluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class FilterPluginManager extends BaseManager
* @var array
*/
protected $aliases = array(
'decrypt' =>'filedecrypt',
'encrypt' =>'fileencrypt',
'lowercase' =>'filelowercase',
'rename' =>'filerename',
'uppercase' =>'fileuppercase',
'decrypt' => 'filedecrypt',
'encrypt' => 'fileencrypt',
'lowercase' => 'filelowercase',
'rename' => 'filerename',
'uppercase' => 'fileuppercase',
);
}
36 changes: 18 additions & 18 deletions src/Transfer/Adapter/ValidatorPluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
class ValidatorPluginManager extends BaseManager
{
protected $aliases = array(
'count' =>'filecount',
'crc32' =>'filecrc32',
'excludeextension' =>'fileexcludeextension',
'excludemimetype' =>'fileexcludemimetype',
'exists' =>'fileexists',
'extension' =>'fileextension',
'filessize' =>'filefilessize',
'hash' =>'filehash',
'imagesize' =>'fileimagesize',
'iscompressed' =>'fileiscompressed',
'isimage' =>'fileisimage',
'md5' =>'filemd5',
'mimetype' =>'filemimetype',
'notexists' =>'filenotexists',
'sha1' =>'filesha1',
'size' =>'filesize',
'upload' =>'fileupload',
'wordcount' =>'filewordcount',
'count' => 'filecount',
'crc32' => 'filecrc32',
'excludeextension' => 'fileexcludeextension',
'excludemimetype' => 'fileexcludemimetype',
'exists' => 'fileexists',
'extension' => 'fileextension',
'filessize' => 'filefilessize',
'hash' => 'filehash',
'imagesize' => 'fileimagesize',
'iscompressed' => 'fileiscompressed',
'isimage' => 'fileisimage',
'md5' => 'filemd5',
'mimetype' => 'filemimetype',
'notexists' => 'filenotexists',
'sha1' => 'filesha1',
'size' => 'filesize',
'upload' => 'fileupload',
'wordcount' => 'filewordcount',
);
}
6 changes: 3 additions & 3 deletions src/Transfer/Transfer.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function setAdapter($adapter, $direction = false, $options = array())
$adapter = '\Zend\File\Transfer\Adapter\\' . ucfirst($adapter);
}

$direction = (integer) $direction;
$direction = (int) $direction;
$this->adapter[$direction] = new $adapter($options);
if (!$this->adapter[$direction] instanceof Adapter\AbstractAdapter) {
throw new Exception\InvalidArgumentException(
Expand All @@ -79,7 +79,7 @@ public function getAdapter($direction = null)
return $this->adapter;
}

$direction = (integer) $direction;
$direction = (int) $direction;
return $this->adapter[$direction];
}

Expand All @@ -94,7 +94,7 @@ public function getAdapter($direction = null)
public function __call($method, array $options)
{
if (array_key_exists('direction', $options)) {
$direction = (integer) $options['direction'];
$direction = (int) $options['direction'];
} else {
$direction = 0;
}
Expand Down

0 comments on commit 9e9b7fb

Please sign in to comment.