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

Commit 387aa24

Browse files
EpeeCheezeEpeeCheeze
committed
Merge branch 'master', remote-tracking branch 'upstream/master'
89 parents 6d3555d + bf1b675 + 8918c09 + 1528233 + a6f33f5 + aee8483 + 9b1ad90 + 92baf0c + 782d34b + da3b5e2 + 8c5486e + 08b5959 + 29cb9fc + a79175d + 186ebc9 + 3af3a6e + 3d17935 + df05eb8 + e421e0f + 00bb39e + 78b260b + a6c654b + 6dcb060 + ba14e90 + dc7d636 + 06375a2 + 53fdaa9 + 80ccc9b + fa80520 + 4009aca + ad280cb + b0d3db4 + 9b28224 + 49a871c + 4145ab4 + ff8e603 + abd0527 + 9dc2f89 + 20317fc + da6fd5b + 1702218 + 487a6e9 + 6051222 + 80b8984 + a1a90b3 + 1d03186 + b2e7f7a + a185b42 + 533f958 + cfc5d6f + da7d3f0 + d11e4f8 + 598cfab + 0955e03 + 8e03b2a + c8941af + 1589b26 + 6e2a869 + 3c9218d + fed889d + 3355853 + 89e0cd8 + e795f2b + 16438c0 + c93bd38 + ac50ffc + a9bc506 + eef23f4 + fcda91a + 056a288 + 607ac6f + 30f7828 + 9d2a936 + 3747749 + 17325fb + 4e43d4b + 0dcaf98 + 3f8e8ac + 32407f8 + 6e0bb7b + c865c5f + 95c45dc + 4829cce + 89ebbef + 99e35fb + 7636944 + 0b01291 + 54ce65a + 88238c7 commit 387aa24

18 files changed

+0
-68
lines changed

‎src/Adapter/DbTable/AbstractAdapter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Zend\Authentication\Adapter\DbTable;
1111

12-
1312
use stdClass;
1413
use Zend\Authentication\Result as AuthenticationResult;
1514
use Zend\Authentication\Adapter\AbstractAdapter as BaseAdapter;

‎test/Adapter/DbTable/CallbackCheckAdapterTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\DbTable;
@@ -16,9 +15,6 @@
1615
use Zend\Db\Sql\Select as DBSelect;
1716

1817
/**
19-
* @category Zend
20-
* @package Zend_Auth
21-
* @subpackage UnitTests
2218
* @group Zend_Auth
2319
* @group Zend_Db_Table
2420
*/

‎test/Adapter/DbTable/CredentialTreatmentAdapterTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\DbTable;
@@ -16,9 +15,6 @@
1615
use Zend\Db\Sql\Select as DBSelect;
1716

1817
/**
19-
* @category Zend
20-
* @package Zend_Auth
21-
* @subpackage UnitTests
2218
* @group Zend_Auth
2319
* @group Zend_Db_Table
2420
*/

‎test/Adapter/DbTableTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter;
1211

1312
use Zend\Authentication\Adapter;
1413

1514
/**
16-
* @category Zend
17-
* @package Zend_Auth
18-
* @subpackage UnitTests
1915
* @group Zend_Auth
2016
* @group Zend_Db_Table
2117
*/

‎test/Adapter/DigestTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter;
@@ -14,9 +13,6 @@
1413
use Zend\Authentication;
1514

1615
/**
17-
* @category Zend
18-
* @package Zend_Auth
19-
* @subpackage UnitTests
2016
* @group Zend_Auth
2117
*/
2218
class DigestTest extends \PHPUnit_Framework_TestCase

‎test/Adapter/Http/ApacheResolverTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\Http;
@@ -14,9 +13,6 @@
1413
use Zend\Authentication\Result as AuthResult;
1514

1615
/**
17-
* @category Zend
18-
* @package Zend_Auth
19-
* @subpackage UnitTests
2016
* @group Zend_Auth
2117
*/
2218
class ApacheTest extends \PHPUnit_Framework_TestCase
@@ -108,9 +104,6 @@ public function testConstructInvalid()
108104
$apache = new Apache($this->_badPath);
109105
}
110106

111-
/**
112-
*
113-
*/
114107
public function providePasswordFiles()
115108
{
116109
$path = __DIR__ . '/TestAsset';

‎test/Adapter/Http/AuthTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\Http;
@@ -16,9 +15,6 @@
1615
use Zend\Http\Response;
1716

1817
/**
19-
* @category Zend
20-
* @package Zend_Auth
21-
* @subpackage UnitTests
2218
* @group Zend_Auth
2319
*/
2420
class AuthTest extends \PHPUnit_Framework_TestCase

‎test/Adapter/Http/FileResolverTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\Http;
1211

1312
use Zend\Authentication\Adapter\Http;
1413

1514
/**
16-
* @category Zend
17-
* @package Zend_Auth
18-
* @subpackage UnitTests
1915
* @group Zend_Auth
2016
*/
2117
class FileTest extends \PHPUnit_Framework_TestCase

‎test/Adapter/Http/ObjectTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\Http;
@@ -18,9 +17,6 @@
1817
use Zend\Http\Response;
1918

2019
/**
21-
* @category Zend
22-
* @package Zend_Auth
23-
* @subpackage UnitTests
2420
* @group Zend_Auth
2521
*/
2622
class ObjectTest extends \PHPUnit_Framework_TestCase

‎test/Adapter/Http/ProxyTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
66
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
* @package Zend_Authentication
98
*/
109

1110
namespace ZendTest\Authentication\Adapter\Http;
@@ -16,9 +15,6 @@
1615
use Zend\Http\Response;
1716

1817
/**
19-
* @category Zend
20-
* @package Zend_Auth
21-
* @subpackage UnitTests
2218
* @group Zend_Auth
2319
*/
2420
class ProxyTest extends \PHPUnit_Framework_TestCase

0 commit comments

Comments
 (0)