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

Commit

Permalink
Merge branch 'fix/cs-concistency' of git://github.com/samsonasik/zf2 …
Browse files Browse the repository at this point in the history 
…into hotfix/3342
  • Loading branch information
@weierophinney
weierophinney committed Jan 7, 2013
106 parents 5e212bf + 099a852 + b4fea29 + ca1f464 + 23d6321 + 296e43e + d444a38 + 3db95a1 + 981d623 + 0a2e3ae + af23c99 + 80f5165 + 78d16a9 + 6bc4f23 + 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 + b1e5a28 + 6c77a16 + d3f730c + 9abb387 + c0b8c0d + f8bc057 + 4f32b4b + aa46231 + 52390dd + aed5127 + d6219ab + cc8aa50 + 3796880 + 3460327 + 6371934 + e50a8ff commit 0af2391
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
16 changes: 8 additions & 8 deletions src/Transfer/Adapter/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public function getValidatorManager()
* Adds a new validator for this class
*
* @param string|Validator\ValidatorInterface $validator Type of validator to add
* @param boolean $breakChainOnFailure If the validation chain should stop an failure
* @param bool $breakChainOnFailure If the validation chain should stop an failure
* @param string|array $options Options to set for the validator
* @param string|array $files Files to limit this validator to
* @return AbstractAdapter
Expand Down Expand Up @@ -533,7 +533,7 @@ public function setOptions($options = array(), $files = null)
case 'ignoreNoFile' :
case 'useByteString' :
case 'detectInfos' :
$this->files[$key]['options'][$name] = (boolean) $value;
$this->files[$key]['options'][$name] = (bool) $value;
break;

default:
Expand Down Expand Up @@ -571,7 +571,7 @@ public function getOptions($files = null)
* Checks if the files are valid
*
* @param string|array $files (Optional) Files to check
* @return boolean True if all checks are valid
* @return bool True if all checks are valid
*/
public function isValid($files = null)
{
Expand Down Expand Up @@ -690,7 +690,7 @@ public function getErrors()
/**
* Are there errors registered?
*
* @return boolean
* @return bool
*/
public function hasErrors()
{
Expand Down Expand Up @@ -886,7 +886,7 @@ public function clearFilters()
* Retrieves the filename of transferred files.
*
* @param string $file (Optional) Element to return the filename for
* @param boolean $path (Optional) Should the path also be returned ?
* @param bool $path (Optional) Should the path also be returned ?
* @return string|array
*/
public function getFileName($file = null, $path = true)
Expand Down Expand Up @@ -1279,7 +1279,7 @@ protected static function toByteString($size)
* Internal function to filter all given files
*
* @param string|array $files (Optional) Files to check
* @return boolean False on error
* @return bool False on error
*/
protected function filter($files = null)
{
Expand Down Expand Up @@ -1394,8 +1394,8 @@ protected function isPathWriteable($path)
* Returns found files based on internal file array and given files
*
* @param string|array $files (Optional) Files to return
* @param boolean $names (Optional) Returns only names on true, else complete info
* @param boolean $noexception (Optional) Allows throwing an exception, otherwise returns an empty array
* @param bool $names (Optional) Returns only names on true, else complete info
* @param bool $noexception (Optional) Allows throwing an exception, otherwise returns an empty array
* @return array Found files
* @throws Exception\RuntimeException On false filename
*/
Expand Down
16 changes: 8 additions & 8 deletions src/Transfer/Adapter/Http.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function send($options = null)
* Checks if the files are valid
*
* @param string|array $files (Optional) Files to check
* @return boolean True if all checks are valid
* @return bool True if all checks are valid
*/
public function isValid($files = null)
{
Expand Down Expand Up @@ -136,7 +136,7 @@ public function isValid($files = null)
* Receive the file from the client (Upload)
*
* @param string|array $files (Optional) Files to receive
* @return boolean
* @return bool
*/
public function receive($files = null)
{
Expand Down Expand Up @@ -207,7 +207,7 @@ public function receive($files = null)
* Checks if the file was already sent
*
* @param string|array $files Files to check
* @return boolean
* @return bool
* @throws Exception\BadMethodCallException Not implemented
*/
public function isSent($files = null)
Expand All @@ -219,7 +219,7 @@ public function isSent($files = null)
* Checks if the file was already received
*
* @param string|array $files (Optional) Files to check
* @return boolean
* @return bool
*/
public function isReceived($files = null)
{
Expand All @@ -241,7 +241,7 @@ public function isReceived($files = null)
* Checks if the file was already filtered
*
* @param string|array $files (Optional) Files to check
* @return boolean
* @return bool
*/
public function isFiltered($files = null)
{
Expand All @@ -263,7 +263,7 @@ public function isFiltered($files = null)
* Has a file been uploaded ?
*
* @param array|string|null $files
* @return boolean
* @return bool
*/
public function isUploaded($files = null)
{
Expand Down Expand Up @@ -391,7 +391,7 @@ public static function getProgress($id = null)
/**
* Checks the APC extension for progress information
*
* @return boolean
* @return bool
*/
public static function isApcAvailable()
{
Expand All @@ -401,7 +401,7 @@ public static function isApcAvailable()
/**
* Checks the UploadProgress extension for progress information
*
* @return boolean
* @return bool
*/
public static function isUploadProgressAvailable()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Transfer/Transfer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Transfer
* Creates a file processing handler
*
* @param string $adapter Adapter to use
* @param boolean $direction OPTIONAL False means Download, true means upload
* @param bool $direction OPTIONAL False means Download, true means upload
* @param array $options OPTIONAL Options to set for this adapter
* @throws Exception\InvalidArgumentException
*/
Expand All @@ -42,7 +42,7 @@ public function __construct($adapter = 'Http', $direction = false, $options = ar
* Sets a new adapter
*
* @param string $adapter Adapter to use
* @param boolean $direction OPTIONAL False means Download, true means upload
* @param bool $direction OPTIONAL False means Download, true means upload
* @param array $options OPTIONAL Options to set for this adapter
* @return Transfer
* @throws Exception\InvalidArgumentException
Expand Down Expand Up @@ -71,7 +71,7 @@ public function setAdapter($adapter, $direction = false, $options = array())
/**
* Returns all set adapters
*
* @param boolean $direction On null, all directions are returned
* @param bool $direction On null, all directions are returned
* On false, download direction is returned
* On true, upload direction is returned
* @return array|Adapter\AbstractAdapter
Expand Down

0 comments on commit 0af2391

Please sign in to comment.