Merge branch 'feature/docblock-simplification' into develop

zendframework · Jan 21, 2013 · 4611daf · 4611daf
commit 4611daf
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 30 deletions.
diff --git a/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php b/src/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
@@ -6,17 +6,11 @@
  * @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_Test
  */
 namespace Zend\Test\PHPUnit\Controller;
 
 use PHPUnit_Framework_ExpectationFailedException;
 
-/**
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- */
 abstract class AbstractConsoleControllerTestCase extends AbstractControllerTestCase
 {
     /**

diff --git a/src/PHPUnit/Controller/AbstractControllerTestCase.php b/src/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -5,7 +5,6 @@
  * @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_Test
  */
 namespace Zend\Test\PHPUnit\Controller;
 
@@ -22,11 +21,6 @@
 use Zend\Uri\Http as HttpUri;
 use Zend\View\Helper\Placeholder;
 
-/**
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- */
 abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
 {
     /**

diff --git a/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php b/src/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -5,18 +5,12 @@
  * @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_Test
  */
 namespace Zend\Test\PHPUnit\Controller;
 
 use PHPUnit_Framework_ExpectationFailedException;
 use Zend\Dom;
 
-/**
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- */
 abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
 {
     /**

diff --git a/src/PHPUnit/Mvc/Service/RouterFactory.php b/src/PHPUnit/Mvc/Service/RouterFactory.php
@@ -5,19 +5,13 @@
  * @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_Test
  */
 namespace Zend\Test\PHPUnit\Mvc\Service;
 
 use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-/**
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- */
 class RouterFactory implements FactoryInterface
 {
     /**

diff --git a/src/PHPUnit/Mvc/Service/ServiceListenerFactory.php b/src/PHPUnit/Mvc/Service/ServiceListenerFactory.php
@@ -5,17 +5,11 @@
  * @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_Test
  */
 namespace Zend\Test\PHPUnit\Mvc\Service;
 
 use Zend\Mvc\Service\ServiceListenerFactory as BaseServiceListenerFactory;
 
-/**
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- */
 class ServiceListenerFactory extends BaseServiceListenerFactory
 {
     /**