Merge zendframework/zendframework#5215 into develop

Conflicts: tests/ZendTest/Code/Generator/AbstractGeneratorTest.php tests/ZendTest/Code/Generator/ClassGeneratorTest.php tests/ZendTest/Code/Generator/DocBlock/Tag/AuthorTagTest.php tests/ZendTest/Code/Generator/DocBlock/Tag/LicenseTagTest.php tests/ZendTest/Code/Generator/DocBlock/Tag/ParamTagTest.php tests/ZendTest/Code/Generator/DocBlock/Tag/ReturnTagTest.php tests/ZendTest/Code/Generator/DocBlock/TagTest.php tests/ZendTest/Code/Generator/DocBlockGeneratorTest.php tests/ZendTest/Code/Generator/FileGeneratorTest.php tests/ZendTest/Code/Generator/MethodGeneratorTest.php tests/ZendTest/Code/Generator/ParameterGeneratorTest.php tests/ZendTest/Code/Generator/PropertyGeneratorTest.php tests/ZendTest/Code/Generator/PropertyValueGeneratorTest.php tests/ZendTest/Code/Generator/ValueGeneratorTest.php
zendframework · Oct 3, 2013 · a1c6ddf · a1c6ddf
2 parents aa6bf87 + 0cd07ce
commit a1c6ddf
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 56 deletions.
diff --git a/test/BlockCipherTest.php b/test/BlockCipherTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -15,9 +14,6 @@
 use Zend\Crypt\Symmetric\Exception;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class BlockCipherTest extends \PHPUnit_Framework_TestCase

diff --git a/test/HashTest.php b/test/HashTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -18,9 +17,6 @@
  */
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class HashTest extends \PHPUnit_Framework_TestCase

diff --git a/test/HmacTest.php b/test/HmacTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -18,9 +17,6 @@
  */
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class HmacTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Key/Derivation/Pbkdf2Test.php b/test/Key/Derivation/Pbkdf2Test.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Key\Derivation;
 
 use Zend\Crypt\Key\Derivation\Pbkdf2;
 
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
- */
 class Pbkdf2Test extends \PHPUnit_Framework_TestCase
 {
 

diff --git a/test/Key/Derivation/SaltedS2kTest.php b/test/Key/Derivation/SaltedS2kTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Key\Derivation;
 
 use Zend\Crypt\Key\Derivation\SaltedS2k;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class SaltedS2kTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Key/Derivation/ScryptTest.php b/test/Key/Derivation/ScryptTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Key\Derivation;
 
 use Zend\Crypt\Key\Derivation\Scrypt;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class ScryptTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Password/ApacheTest.php b/test/Password/ApacheTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Password;
@@ -14,9 +13,6 @@
 use Zend\Crypt\Password\Exception;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class ApacheTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Password/BcryptTest.php b/test/Password/BcryptTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Password;
@@ -15,9 +14,6 @@
 use Zend\Crypt\Password\Exception;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class BcryptTest extends \PHPUnit_Framework_TestCase

diff --git a/test/PublicKey/DiffieHellmanTest.php b/test/PublicKey/DiffieHellmanTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -15,9 +14,6 @@
 use Zend\Math\Exception\RuntimeException as MathException;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class DiffieHellmanTest extends \PHPUnit_Framework_TestCase

diff --git a/test/PublicKey/RsaTest.php b/test/PublicKey/RsaTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -15,9 +14,6 @@
 use Zend\Crypt\PublicKey\Rsa\Exception;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class RsaTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Symmetric/McryptTest.php b/test/Symmetric/McryptTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Symmetric;
@@ -16,9 +15,6 @@
 use Zend\Config\Config;
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class McryptTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Symmetric/Padding/Pkcs7Test.php b/test/Symmetric/Padding/Pkcs7Test.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt\Symmetric\Padding;
 
 use Zend\Crypt\Symmetric\Padding\Pkcs7;
 
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
- */
 class Pkcs7Test extends \PHPUnit_Framework_TestCase
 {
     /** @var Pkcs7 */

diff --git a/test/UtilsTest.php b/test/UtilsTest.php
@@ -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_Crypt
  */
 
 namespace ZendTest\Crypt;
@@ -18,9 +17,6 @@
  */
 
 /**
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage UnitTests
  * @group      Zend_Crypt
  */
 class UtilsTest extends \PHPUnit_Framework_TestCase