This repository has been archived by the owner on Jan 30, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'paginator-renamed-interfaces' of https://github.com/pro…
…lic/zf2 into feature/zen27-paginator
- Loading branch information
57 parents
f7937b5
+
a514416
+
778823f
+
fff1957
+
35beb1b
+
ecb2a1a
+
67a31fa
+
c0ee14a
+
7273469
+
62e104e
+
293b0d0
+
c59092f
+
b3e8431
+
615f1cb
+
198a3b9
+
1630584
+
7627438
+
84a5bf6
+
ad86c9d
+
a84a8ca
+
4198a62
+
e822871
+
431867b
+
200dbe0
+
7277f0b
+
2408da8
+
2413f67
+
4731ffc
+
d177c96
+
b27c24b
+
ec13154
+
8e7b30c
+
6c4437a
+
2a2ed86
+
366d656
+
5f3d390
+
666d47b
+
dd0e03b
+
1a5602a
+
c01cd9c
+
6849552
+
8b79ca2
+
e84f0d1
+
9f1b34e
+
c453b3e
+
3d74be7
+
999502e
+
a46d96f
+
fba87c0
+
ce665da
+
ef2dd94
+
a66c89a
+
b997097
+
da0e97d
+
73cc878
+
eb4798a
+
7ed204a
commit 18e54b8
Showing
33 changed files
with
331 additions
and
560 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter; | ||
|
|
||
| use Countable; | ||
|
|
||
| /** | ||
| * Interface for pagination adapters. | ||
| * | ||
| * @category Zend | ||
| * @package Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
| interface AdapterInterface extends Countable | ||
| { | ||
| /** | ||
| * Returns an collection of items for a page. | ||
| * | ||
| * @param integer $offset Page offset | ||
| * @param integer $itemCountPerPage Number of items per page | ||
| * @return array | ||
| */ | ||
| public function getItems($offset, $itemCountPerPage); | ||
| } |
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 |
|---|---|---|
| @@ -1,34 +1,22 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter; | ||
|
|
||
| use Zend\Paginator\Adapter; | ||
|
|
||
| /** | ||
| * @category Zend | ||
| * @package Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
| class ArrayAdapter implements Adapter | ||
| class ArrayAdapter implements AdapterInterface | ||
| { | ||
| /** | ||
| * ArrayAdapter | ||
|
|
||
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 |
|---|---|---|
| @@ -1,35 +1,24 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend_Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter; | ||
|
|
||
| use Zend\Db\Sql; | ||
| use Zend\Paginator; | ||
|
|
||
| /** | ||
| * @category Zend | ||
| * @package Zend_Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
| class DbSelect implements Paginator\Adapter | ||
| class DbSelect implements AdapterInterface | ||
| { | ||
| /** | ||
| * Name of the row count column | ||
|
|
||
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 |
|---|---|---|
| @@ -1,21 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend_Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter; | ||
|
|
||
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter\Exception; | ||
|
|
||
| use Zend\Paginator\Exception\ExceptionInterface as Exception; | ||
|
|
||
| /** | ||
| * @category Zend | ||
| * @package Zend_Paginator | ||
| * @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 | ||
| */ | ||
| interface ExceptionInterface extends Exception | ||
| {} |
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 |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Paginator\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 | ||
| * @version $Id$ | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter\Exception; | ||
|
|
@@ -31,5 +19,5 @@ | |
| */ | ||
| class InvalidArgumentException | ||
| extends \Zend\Paginator\Exception\InvalidArgumentException | ||
| implements \Zend\Paginator\Adapter\Exception | ||
| implements ExceptionInterface | ||
| {} | ||
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 |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Paginator\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 | ||
| * @version $Id$ | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter\Exception; | ||
|
|
@@ -31,5 +19,5 @@ | |
| */ | ||
| class RuntimeException | ||
| extends \Zend\Paginator\Exception\RuntimeException | ||
| implements \Zend\Paginator\Adapter\Exception | ||
| implements ExceptionInterface | ||
| {} | ||
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 |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend\Paginator\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 | ||
| * @version $Id$ | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter\Exception; | ||
|
|
@@ -29,5 +17,7 @@ | |
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
| class UnexpectedValueException extends \UnexpectedValueException implements \Zend\Paginator\Adapter\Exception | ||
| class UnexpectedValueException | ||
| extends \Zend\Paginator\Exception\UnexpectedValueException | ||
| implements ExceptionInterface | ||
| {} | ||
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 |
|---|---|---|
| @@ -1,21 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend_Paginator | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Paginator | ||
| */ | ||
|
|
||
| namespace Zend\Paginator\Adapter; | ||
|
|
@@ -28,7 +18,7 @@ | |
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
| class Iterator implements Paginator\Adapter | ||
| class Iterator implements AdapterInterface | ||
| { | ||
| /** | ||
| * Iterator which implements Countable | ||
|
|
||
Oops, something went wrong.