Skip to content
This repository has been archived by the owner on Jan 29, 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
156 parents affa379 + a196779 + 3d3d017 + 6fa20e6 + b20a39d + 226510f + 6d779b2 + ae8a2d3 + b2b7d74 + d748fa1 + dab45d1 + cdb0e25 + 55ca933 + 58174bc + 1804746 + 67c0075 + e5983dd + a8b3425 + a2a193a + 33d1c27 + 1d5cfa1 + 460ae0b + c577f06 + db33b2e + fea371a + c93bbae + a4ff530 + cbd4621 + 4b4dffb + 00380d2 + 3895f9f + 6349844 + b6905a7 + b7735a0 + 8312aef + 7be4333 + 8625190 + 4dd38f5 + e02bd81 + 87c797f + 73208bf + 0272cd1 + 1fcbea4 + 197a891 + 5859e98 + d34ef1c + e06dc2f + 4907ff6 + fd0e0ba + 891fbf7 + 83d5b01 + 4579f15 + c86ed1e + 16b8f20 + 83086b6 + a81c8a5 + a85d989 + 55ef06c + a2d63b1 + 8210d1d + 0a08fc0 + 7d37340 + ab0ab2a + b9e0b9b + e1d4bda + e251276 + 161ba87 + f10c77c + 58cc6ef + cecfbb0 + c165fb8 + 1febb29 + 3325e48 + 8b68fab + 43c1b37 + ec52465 + 2904103 + e4d7a5a + be7b13f + f8dd43d + b1b3322 + 93ccc75 + 2d494af + 25e9a69 + 3f70aa8 + 598d6ed + 8161582 + c01dc55 + 98634fe + 0c55546 + 1c83b8f + 815d8cc + 19c90c8 + 5dbf1b9 + 4a927fd + 4a648ec + d0636ac + 840f139 + aafb3ee + 8600965 + b26220b + 860ba0d + 759cd42 + eebf7bc + 6546e0d + 11d36d3 + 4a1db1e + 04eebff + 892dcff + b878b24 + 2db85a1 + 97242e6 + 9ee6b4d + 13fabed + 8fe32d7 + 035474f + 918b5da + 8d65fb0 + 1f16b54 + 282eead + cb64f10 + 491c672 + e10e997 + 93858ca + d41e72e + 9af5add + 309bc00 + 984be73 + be29716 + 41232e8 + 1b6d07e + 8cd4674 + ee1d485 + e5aa383 + fc3991f + ba6e7b6 + 90ecccb + b1db52f + ef24a14 + ae89a5d + 2963b07 + 5174cf5 + ce1dffc + 0c36811 + 486ca02 + f995ad2 + c4edf83 + f7ed875 + 372eb58 + c450aa4 + b5dc21d + 1dfee57 + 55843e2 + 4c23096 + eaee668 + acb0cc0 commit 39b294f
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 51 deletions.
4 changes: 0 additions & 4 deletions test/AbstractListenerAggregateTest.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_EventManager
*/

namespace ZendTest\EventManager;

use ZendTest\EventManager\TestAsset\MockAbstractListenerAggregate;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class AbstractListenerAggregateTest extends \PHPUnit_Framework_TestCase
Expand Down
1 change: 0 additions & 1 deletion test/EventManagerAwareTraitTest.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_EventManager
*/

namespace ZendTest\EventManager;
Expand Down
4 changes: 0 additions & 4 deletions test/EventManagerTest.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_EventManager
*/

namespace ZendTest\EventManager;
Expand All @@ -21,9 +20,6 @@
use Zend\Stdlib\CallbackHandler;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class EventManagerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/FilterChainTest.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_EventManager
*/

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

/**
* @category Zend
* @package Zend_Stdlib
* @subpackage UnitTests
* @group Zend_Stdlib
*/
class FilterChainTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/GlobalEventManagerTest.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_EventManager
*/

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

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class GlobalEventManagerTest extends \PHPUnit_Framework_TestCase
Expand Down
1 change: 0 additions & 1 deletion test/ListenerAggregateTraitTest.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_EventManager
*/

namespace ZendTest\EventManager;
Expand Down
4 changes: 0 additions & 4 deletions test/StaticEventManagerTest.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_EventManager
*/

namespace ZendTest\EventManager;
Expand All @@ -16,9 +15,6 @@
use Zend\EventManager\StaticEventManager;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class StaticEventManagerTest extends TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/StaticIntegrationTest.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_EventManager
*/

namespace ZendTest\EventManager;
Expand All @@ -15,9 +14,6 @@
use PHPUnit_Framework_TestCase as TestCase;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class StaticIntegrationTest extends TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/ClassWithEvents.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_EventManager
*/

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

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class ClassWithEvents
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/Functor.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/MockAbstractListenerAggregate.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand All @@ -14,9 +13,6 @@
use Zend\EventManager\EventManagerInterface;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class MockAbstractListenerAggregate extends AbstractListenerAggregate
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/MockAggregate.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand All @@ -14,9 +13,6 @@
use Zend\EventManager\ListenerAggregateInterface;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class MockAggregate implements ListenerAggregateInterface
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/MockListenerAggregateTrait.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand All @@ -14,9 +13,6 @@
use Zend\EventManager\ListenerAggregateTrait;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class MockListenerAggregateTrait
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/SharedMockAggregate.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand All @@ -14,9 +13,6 @@
use Zend\EventManager\SharedListenerAggregateInterface;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class SharedMockAggregate implements SharedListenerAggregateInterface
Expand Down
4 changes: 0 additions & 4 deletions test/TestAsset/StaticEventsMock.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_EventManager
*/

namespace ZendTest\EventManager\TestAsset;
Expand All @@ -14,9 +13,6 @@
use Zend\Stdlib\CallbackHandler;

/**
* @category Zend
* @package Zend_EventManager
* @subpackage UnitTests
* @group Zend_EventManager
*/
class StaticEventsMock implements SharedEventManagerInterface
Expand Down

0 comments on commit 39b294f

Please sign in to comment.