| Index: branches/FileBackend/phase3/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -592,11 +592,11 @@ |
| 593 | 593 | /** |
| 594 | 594 | * Get a connection to the swift proxy |
| 595 | 595 | * |
| 596 | | - * @return CF_Connection|null |
| | 596 | + * @return CF_Connection|false |
| 597 | 597 | */ |
| 598 | 598 | protected function getConnection() { |
| 599 | 599 | if ( $this->conn === false ) { |
| 600 | | - return null; // failed last attempt |
| | 600 | + return false; // failed last attempt |
| 601 | 601 | } |
| 602 | 602 | // Authenticate with proxy and get a session key. |
| 603 | 603 | // Session keys expire after a while, so we renew them periodically. |
| — | — | @@ -638,7 +638,7 @@ |
| 639 | 639 | class SwiftFileIterator implements Iterator { |
| 640 | 640 | /** @var Array */ |
| 641 | 641 | protected $bufferIter = array(); |
| 642 | | - protected $bufferAfter = ''; // string; list items *after* this path |
| | 642 | + protected $bufferAfter = null; // string; list items *after* this path |
| 643 | 643 | protected $pos = 0; // integer |
| 644 | 644 | |
| 645 | 645 | /** @var SwiftFileBackend */ |
| — | — | @@ -685,7 +685,7 @@ |
| 686 | 686 | |
| 687 | 687 | public function rewind() { |
| 688 | 688 | $this->pos = 0; |
| 689 | | - $this->bufferAfter = ''; |
| | 689 | + $this->bufferAfter = null; |
| 690 | 690 | $this->bufferIter = $this->backend->getFileListPageInternal( |
| 691 | 691 | $this->container, $this->dir, $this->bufferAfter, self::PAGE_SIZE |
| 692 | 692 | ); |