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

Commit

Permalink
Merge branch 'master' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
167 parents 77f83ca + 130a50a + f12feba + 4452247 + 2630a49 + 43cba4d + e4204b5 + d05ccf2 + e604cfb + ca97c01 + 287eb63 + 51a49db + a59e5dc + 548a07d + 8505b4c + 2716d1a + 37045c3 + 6903d5f + cdad453 + 9db7df2 + 9bb9d9a + 41b2dc0 + 5295cf8 + 27f9b6d + b273434 + 5b111b1 + ee4a022 + 5130ae3 + aff706f + f73a53d + d4a913a + b29f072 + 651a727 + 430d154 + 1839a34 + 0d5d64e + 5cde84e + dc8ee4d + 85d900a + 887c312 + 9c949ae + 0fc5669 + e29d393 + e25c698 + ca5bdbb + 18e54b8 + 73cc878 + 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 + 1302f0b + a1bbaa9 + 6bfa503 + b4b9ece + 9b1ac2d + 30880b8 + e308f6d + 8da89be + 199755f + 2310cd0 + 4e7316f + 1d6c476 + c2593db + c6ff37b + 5344902 + a35c230 + 39052a9 + 8152f2f + e0f8777 + d1f068b + 006fb88 + 6261074 + 8bf6181 + 33e79d4 + a778f16 + 57199ed + 3653e0c + 5b5a61e + 082fd49 + d56f4bf + d4ad9b4 + c2442b4 + a56d05b + 7400cfb + 8794fff + 0877be7 + 9c75f77 + 261c157 + 94f1dd4 + ae538e5 + bf68265 + c222657 + 56e71f6 + b95fff7 + 7736317 + 8a3b848 + e18ea15 + ae1a095 + a18a97f + c3ef55c + 09f0424 + 6369f0d + bbce3db + e7612d4 + af38e3f + cd3f4d4 + 498edd0 + a792bd9 + 9922da0 + 350dc8b + 7960d27 + a406fa3 + ace2d81 + d9ed179 + 622be5c + b68216d + 0ff2c31 commit 9b14073
Show file tree
Hide file tree
Showing 17 changed files with 2 additions and 65 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"phpunit/PHPUnit": "~4.0"
},
"suggest": {
"zendframework/zend-cache": "Zend\\Cache component to support cache features",
"zendframework/zend-cache": "To support cache feature",
"zendframework/zend-db": "Zend\\Db component",
"zendframework/zend-filter": "Zend\\Filter component",
"zendframework/zend-json": "Zend\\Json component",
Expand Down
2 changes: 1 addition & 1 deletion src/SerializableLimitIterator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SerializableLimitIterator extends LimitIterator implements Serializable, A
* @param int $count Maximum number of elements to show or -1 for all
* @see LimitIterator::__construct
*/
public function __construct (Iterator $it, $offset=0, $count=-1)
public function __construct(Iterator $it, $offset=0, $count=-1)
{
parent::__construct($it, $offset, $count);
$this->offset = $offset;
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/ArrayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\Adapter;

use Zend\Paginator\Adapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class ArrayTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/DbSelectTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\Adapter;
Expand All @@ -15,9 +14,6 @@
use Zend\Db\Sql\Expression;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class DbSelectTest extends \PHPUnit_Framework_TestCase
Expand Down
1 change: 0 additions & 1 deletion test/Adapter/DbTableGatewayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\Adapter;
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/IteratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\Adapter;
Expand All @@ -15,9 +14,6 @@
use Zend\Paginator\Exception;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class IteratorTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/NullTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\Adapter;
Expand All @@ -14,9 +13,6 @@
use Zend\Paginator;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class NullTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/AdapterPluginManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator;
Expand All @@ -15,9 +14,6 @@
use Zend\Mvc\Service\ServiceManagerConfig;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class AdapterPluginManagerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/FactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator;
Expand All @@ -15,9 +14,6 @@
use ZendTest\Paginator\TestAsset\TestArrayAggregate;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class FactoryTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/PaginatorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator;
Expand All @@ -25,9 +24,6 @@
use ZendTest\Paginator\TestAsset\TestArrayAggregate;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class PaginatorTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ScrollingStyle/AllTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\ScrollingStyle;
Expand All @@ -14,9 +13,6 @@
use Zend\Paginator\Adapter\ArrayAdapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class AllTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ScrollingStyle/ElasticTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\ScrollingStyle;
Expand All @@ -14,9 +13,6 @@
use Zend\Paginator\Adapter\ArrayAdapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class ElasticTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ScrollingStyle/JumpingTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\ScrollingStyle;
Expand All @@ -14,9 +13,6 @@
use Zend\Paginator\Adapter\ArrayAdapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class JumpingTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ScrollingStyle/SlidingTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\ScrollingStyle;
Expand All @@ -14,9 +13,6 @@
use Zend\Paginator\Adapter\ArrayAdapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
* @group Zend_Paginator
*/
class SlidingTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/ScrollingStylePluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\TestAsset;

use Zend\Paginator\ScrollingStylePluginManager as BaseScrollingStylePluginManager;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
*/
class ScrollingStylePluginManager extends BaseScrollingStylePluginManager
{
}
6 changes: 0 additions & 6 deletions test/TestAsset/TestAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\TestAsset;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
*/
class TestAdapter extends \ArrayObject implements \Zend\Paginator\Adapter\AdapterInterface
{
public function count()
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/TestArrayAggregate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Paginator
*/

namespace ZendTest\Paginator\TestAsset;

use Zend\Paginator;
use Zend\Paginator\Adapter;

/**
* @category Zend
* @package Zend_Paginator
* @subpackage UnitTests
*/
class TestArrayAggregate implements Paginator\AdapterAggregateInterface
{
public function getPaginatorAdapter()
Expand Down

0 comments on commit 9b14073

Please sign in to comment.