forked from zendframework/zendframework
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from Maks3w/hotfix/ZF-27-Cloud
Hotfix/zf 27 cloud
- Loading branch information
Showing
82 changed files
with
485 additions
and
483 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud | ||
| * @package Zend_Cloud | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
|
|
@@ -24,7 +24,7 @@ | |
| * Abstract factory for Zend\Cloud resources | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud | ||
| * @package Zend_Cloud | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
|
|
@@ -44,8 +44,8 @@ private function __construct() | |
| * Get an individual adapter instance | ||
| * | ||
| * @param string $adapterOption | ||
| * @param array|Zend\Config $options | ||
| * @return null|DocumentService\Adapter|QueueService\Adapter|StorageService\Adapter|Infrastructure\Adapter | ||
| * @param array|\Zend\Config\Config $options | ||
| * @return null|DocumentService\Adapter\AdapterInterface|QueueService\Adapter\AdapterInterface|StorageService\Adapter\AdapterInterface|Infrastructure\Adapter\AdapterInterface | ||
| */ | ||
| protected static function _getAdapter($adapterOption, $options) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService | ||
| * @package Zend_Cloud_DocumentService | ||
| * @subpackage Adapter | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
@@ -35,7 +35,7 @@ | |
| * - query class objects | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService | ||
| * @package Zend_Cloud_DocumentService | ||
| * @subpackage Adapter | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
@@ -69,7 +69,7 @@ abstract class AbstractAdapter implements AdapterInterface | |
| * Set the class for document objects | ||
| * | ||
| * @param string $class | ||
| * @return Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| * @return \Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| */ | ||
| public function setDocumentClass($class) | ||
| { | ||
|
|
@@ -91,7 +91,7 @@ public function getDocumentClass() | |
| * Set the class for document set objects | ||
| * | ||
| * @param string $class | ||
| * @return Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| * @return \Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| */ | ||
| public function setDocumentSetClass($class) | ||
| { | ||
|
|
@@ -113,7 +113,7 @@ public function getDocumentSetClass() | |
| * Set the query class for query objects | ||
| * | ||
| * @param string $class | ||
| * @return Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| * @return \Zend\Cloud\DocumentService\Adapter\AbstractAdapter | ||
| */ | ||
| public function setQueryClass($class) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud | ||
| * @package Zend_Cloud | ||
| * @subpackage DocumentService | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
@@ -34,7 +34,7 @@ | |
| * access control support in future versions of the interface. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud | ||
| * @package Zend_Cloud | ||
| * @subpackage DocumentService | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
@@ -75,15 +75,15 @@ public function listCollections($options = null); | |
| * | ||
| * @param string $collectionName | ||
| * @param null|array $options | ||
| * @return Zend\Cloud\DocumentService\DocumentSet | ||
| * @return \Zend\Cloud\DocumentService\DocumentSet | ||
| */ | ||
| public function listDocuments($collectionName, array $options = null); | ||
|
|
||
| /** | ||
| * Insert document | ||
| * | ||
| * @param string $collectionName Collection name | ||
| * @param Zend\Cloud\DocumentService\Document $document Document to insert | ||
| * @param \Zend\Cloud\DocumentService\Document $document Document to insert | ||
| * @param array $options | ||
| * @return boolean | ||
| */ | ||
|
|
@@ -94,7 +94,7 @@ public function insertDocument($collectionName, $document, $options = null); | |
| * The new document replaces the existing document with the same ID. | ||
| * | ||
| * @param string $collectionName Collection name | ||
| * @param Zend\Cloud\DocumentService\Document $document | ||
| * @param \Zend\Cloud\DocumentService\Document $document | ||
| * @param array $options | ||
| */ | ||
| public function replaceDocument($collectionName, $document, $options = null); | ||
|
|
@@ -105,8 +105,8 @@ public function replaceDocument($collectionName, $document, $options = null); | |
| * Fields not specified in the set will be left as-is. | ||
| * | ||
| * @param string $collectionName | ||
| * @param mixed|Zend\Cloud\DocumentService\Document $documentID Document ID, adapter-dependent, or document containing updates | ||
| * @param array|Zend\Cloud\DocumentService\Document $fieldset Set of fields to update | ||
| * @param mixed|\Zend\Cloud\DocumentService\Document $documentID Document ID, adapter-dependent, or document containing updates | ||
| * @param array|\Zend\Cloud\DocumentService\Document $fieldset Set of fields to update | ||
| * @param array $options | ||
| * @return boolean | ||
| */ | ||
|
|
@@ -130,7 +130,7 @@ public function deleteDocument($collectionName, $documentID, $options = null); | |
| * @param string $collectionName Collection name | ||
| * @param mixed $documentID Document ID, adapter-dependent | ||
| * @param array $options | ||
| * @return Zend\Cloud\DocumentService\Document | ||
| * @return \Zend\Cloud\DocumentService\Document | ||
| */ | ||
| public function fetchDocument($collectionName, $documentID, $options = null); | ||
|
|
||
|
|
@@ -149,7 +149,7 @@ public function query($collectionName, $query, $options = null); | |
| * Create query statement | ||
| * | ||
| * @param string $fields | ||
| * @return Zend\Cloud\DocumentService\Query | ||
| * @return \Zend\Cloud\DocumentService\Query | ||
| */ | ||
| public function select($fields = null); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService\Adapter | ||
| * @package Zend_Cloud_DocumentService_Adapter | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService\Adapter | ||
| * @package Zend_Cloud_DocumentService_Adapter | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
|
|
@@ -25,7 +25,7 @@ | |
|
|
||
| /** | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService\Adapter | ||
| * @package Zend_Cloud_DocumentService_Adapter | ||
| * @subpackage Exception | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Cloud\DocumentService | ||
| * @package Zend_Cloud_DocumentService | ||
| * @subpackage Adapter | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
@@ -23,7 +23,7 @@ | |
|
|
||
|
|
||
| /** | ||
| * @package Zend\Cloud\DocumentService\Adapter | ||
| * @package Zend_Cloud_DocumentService_Adapter | ||
| * @subpackage Exception | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
|
|
||
Oops, something went wrong.