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/2700'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#2700
  • Loading branch information
@weierophinney
weierophinney committed Oct 8, 2012
112 parents 38f8f99 + cfc46bf + a576736 + 0650b43 + 6fc76b3 + 2dcfeeb + 80461fa + db66f77 + 907dad9 + a4b3fcc + e0d3e79 + eb7f4fc + f5f296f + c1bc89d + 2cfde08 + 5ed923d + 7bfa121 + 0b38f0b + 1914ec7 + 47650bd + b7f9c80 + d490dab + 0b235a6 + ea8420a + 806e429 + 14b8e16 + 2c9f881 + 1591173 + 3288109 + 6149722 + fb18be8 + 2f56d24 + 256686b + 3cc679d + da18011 + 93ac388 + 57ef4a3 + 2f2851a + 2ec1dbc + 9a48955 + b6b50b9 + a16c105 + a634561 + 779d017 + e998d74 + e0c0b66 + 677bd85 + bd0abb6 + 7e23a9b + 76e9a65 + 9666e65 + 0fb7a6e + b476244 + a566cb1 + 84a7972 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f + 00d7ef1 + 88e29ab + 04f5596 + d4b9187 + 83cb40e + e80536c + 8344c40 + 314ef07 + f8fe680 + 7d99158 + 5a453b7 + 16b512c + e13bb78 + f8c8e84 + 0e833f2 + 463bd0b + e23f919 + c0f3fe1 + 9af4d23 + fbdafd9 + 46c341e + 1fcdf03 + 9e5c38e + 41f8caa + f236745 + ab9047d + c7b4a3f + 5cbe79f + dc8268a + cbafbe9 + d2c6567 + 0cc6fdf + 09daef8 + df6fc46 + ba228cf + 67d18da + 48a0084 + c78da38 + 76f6205 + 02baf86 + 56854a7 + 51b08b5 + 86f37cb + 5ecd1ed + a4cca36 + f5abdbd + 66790e4 + 38ac213 commit 19c92ef
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
16 changes: 8 additions & 8 deletions src/Protocol/Imap.php
View file
Expand Up @@ -473,7 +473,7 @@ public function examineOrSelect($command = 'EXAMINE', $box = 'INBOX')
$result[strtolower($tokens[1])] = $tokens[0];
break;
case '[UIDVALIDITY':
$result['uidvalidity'] = (int)$tokens[2];
$result['uidvalidity'] = (int) $tokens[2];
break;
default:
// ignore
Expand Down Expand Up @@ -529,11 +529,11 @@ public function fetch($items, $from, $to = null)
if (is_array($from)) {
$set = implode(',', $from);
} elseif ($to === null) {
$set = (int)$from;
$set = (int) $from;
} elseif ($to === INF) {
$set = (int)$from . ':*';
$set = (int) $from . ':*';
} else {
$set = (int)$from . ':' . (int)$to;
$set = (int) $from . ':' . (int)$to;
}

$items = (array)$items;
Expand Down Expand Up @@ -643,9 +643,9 @@ public function store(array $flags, $from, $to = null, $mode = null, $silent = t
}

$flags = $this->escapeList($flags);
$set = (int)$from;
$set = (int) $from;
if ($to != null) {
$set .= ':' . ($to == INF ? '*' : (int)$to);
$set .= ':' . ($to == INF ? '*' : (int) $to);
}

$result = $this->requestAndResponse('STORE', array($set, $item, $flags), $silent);
Expand Down Expand Up @@ -702,9 +702,9 @@ public function append($folder, $message, $flags = null, $date = null)
*/
public function copy($folder, $from, $to = null)
{
$set = (int)$from;
$set = (int) $from;
if ($to != null) {
$set .= ':' . ($to == INF ? '*' : (int)$to);
$set .= ':' . ($to == INF ? '*' : (int) $to);
}

return $this->requestAndResponse('COPY', array($set, $this->escapeString($folder)), true);
Expand Down
8 changes: 4 additions & 4 deletions src/Protocol/Pop3.php
View file
Expand Up @@ -275,15 +275,15 @@ public function getList($msgno = null)
$result = $this->request("LIST $msgno");

list(, $result) = explode(' ', $result);
return (int)$result;
return (int) $result;
}

$result = $this->request('LIST', true);
$messages = array();
$line = strtok($result, "\n");
while ($line) {
list($no, $size) = explode(' ', trim($line));
$messages[(int)$no] = (int)$size;
$messages[(int)$no] = (int) $size;
$line = strtok("\n");
}

Expand Down Expand Up @@ -315,7 +315,7 @@ public function uniqueid($msgno = null)
continue;
}
list($no, $id) = explode(' ', trim($line), 2);
$messages[(int)$no] = $id;
$messages[(int) $no] = $id;
}

return $messages;
Expand Down Expand Up @@ -347,7 +347,7 @@ public function top($msgno, $lines = 0, $fallback = false)
}
$this->hasTop = true;

$lines = (!$lines || $lines < 1) ? 0 : (int)$lines;
$lines = (!$lines || $lines < 1) ? 0 : (int) $lines;

try {
$result = $this->request("TOP $msgno $lines", true);
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Folder.php
View file
Expand Up @@ -170,7 +170,7 @@ public function __unset($name)
*/
public function __toString()
{
return (string)$this->getGlobalName();
return (string) $this->getGlobalName();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Folder/Maildir.php
View file
Expand Up @@ -58,7 +58,7 @@ class Maildir extends Storage\Maildir implements FolderInterface
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

if (!isset($params->dirname) || !is_dir($params->dirname)) {
Expand Down Expand Up @@ -186,7 +186,7 @@ public function getFolders($rootFolder = null)
*/
public function selectFolder($globalName)
{
$this->currentFolder = (string)$globalName;
$this->currentFolder = (string) $globalName;

// getting folder from folder tree for validation
$folder = $this->getFolders($this->currentFolder);
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Folder/Mbox.php
View file
Expand Up @@ -54,7 +54,7 @@ class Mbox extends Storage\Mbox implements FolderInterface
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

if (isset($params->filename)) {
Expand Down Expand Up @@ -160,7 +160,7 @@ public function getFolders($rootFolder = null)
*/
public function selectFolder($globalName)
{
$this->currentFolder = (string)$globalName;
$this->currentFolder = (string) $globalName;

// getting folder from folder tree for validation
$folder = $this->getFolders($this->currentFolder);
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Imap.php
View file
Expand Up @@ -181,7 +181,7 @@ public function getRawContent($id, $part = null)
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

$this->has['flags'] = true;
Expand Down Expand Up @@ -307,7 +307,7 @@ public function getNumberByUniqueId($id)
*/
public function getFolders($rootFolder = null)
{
$folders = $this->protocol->listMailbox((string)$rootFolder);
$folders = $this->protocol->listMailbox((string) $rootFolder);
if (!$folders) {
throw new Exception\InvalidArgumentException('folder not found');
}
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Maildir.php
View file
Expand Up @@ -221,7 +221,7 @@ public function getRawContent($id, $part = null)
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

if (!isset($params->dirname) || !is_dir($params->dirname)) {
Expand Down Expand Up @@ -330,7 +330,7 @@ protected function _getMaildirFiles($dh, $dirname, $default_flags = array())
'flaglookup' => array_flip($named_flags),
'filename' => $dirname . $entry);
if ($size !== null) {
$data['size'] = (int)$size;
$data['size'] = (int) $size;
}
$this->files[] = $data;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Mbox.php
View file
Expand Up @@ -183,7 +183,7 @@ public function getRawContent($id, $part = null)
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

if (!isset($params->filename)) {
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Pop3.php
View file
Expand Up @@ -40,7 +40,7 @@ public function countMessages()
$count = 0; // "Declare" variable before first usage.
$octets = 0; // "Declare" variable since it's passed by reference
$this->protocol->status($count, $octets);
return (int)$count;
return (int) $count;
}

/**
Expand Down Expand Up @@ -132,7 +132,7 @@ public function getRawContent($id, $part = null)
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

$this->has['fetchPart'] = false;
Expand Down
12 changes: 6 additions & 6 deletions src/Storage/Writable/Maildir.php
View file
Expand Up @@ -87,7 +87,7 @@ public static function initMaildir($dir)
public function __construct($params)
{
if (is_array($params)) {
$params = (object)$params;
$params = (object) $params;
}

if (!empty($params->create) && isset($params->dirname) && !file_exists($params->dirname . DIRECTORY_SEPARATOR . 'cur')) {
Expand Down Expand Up @@ -495,7 +495,7 @@ public function appendMessage($message, $folder = null, $flags = null, $recent =
'flags' => $flags,
'filename' => $new_filename);
if ($this->quota) {
$this->_addQuotaEntry((int)$size, 1);
$this->_addQuotaEntry((int) $size, 1);
}
}

Expand Down Expand Up @@ -565,7 +565,7 @@ public function copyMessage($id, $folder)
}

if ($this->quota) {
$this->_addQuotaEntry((int)$size, 1);
$this->_addQuotaEntry((int) $size, 1);
}
}

Expand Down Expand Up @@ -686,7 +686,7 @@ public function removeMessage($id)
// remove the gap
$this->files = array_values($this->files);
if ($this->quota) {
$this->_addQuotaEntry(0 - (int)$size, -1);
$this->_addQuotaEntry(0 - (int) $size, -1);
}
}

Expand Down Expand Up @@ -923,8 +923,8 @@ protected function _addQuotaEntry($size, $count = 1)
if (!file_exists($this->rootdir . 'maildirsize')) {
// TODO: should get file handler from _calculateQuota
}
$size = (int)$size;
$count = (int)$count;
$size = (int) $size;
$count = (int) $count;
file_put_contents($this->rootdir . 'maildirsize', "$size $count\n", FILE_APPEND);
}

Expand Down

0 comments on commit 19c92ef

Please sign in to comment.