Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · f045e85 · f045e85
commit f045e85
Show file tree

Hide file tree

Showing 19 changed files with 3 additions and 71 deletions.
diff --git a/src/Adapter/DbTable/AbstractAdapter.php b/src/Adapter/DbTable/AbstractAdapter.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Authentication\Adapter\DbTable;
 
-
 use stdClass;
 use Zend\Authentication\Result as AuthenticationResult;
 use Zend\Authentication\Adapter\AbstractAdapter as BaseAdapter;

diff --git a/src/Adapter/DbTable/CallbackCheckAdapter.php b/src/Adapter/DbTable/CallbackCheckAdapter.php
@@ -45,7 +45,7 @@ public function __construct(
         if (null !== $credentialValidationCallback) {
             $this->setCredentialValidationCallback($credentialValidationCallback);
         } else {
-            $this->setCredentialValidationCallback(function($a, $b) {
+            $this->setCredentialValidationCallback(function ($a, $b) {
                 return $a === $b;
             });
         }

diff --git a/test/Adapter/DbTable/CallbackCheckAdapterTest.php b/test/Adapter/DbTable/CallbackCheckAdapterTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\DbTable;
@@ -16,9 +15,6 @@
 use Zend\Db\Sql\Select as DBSelect;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  * @group      Zend_Db_Table
  */
@@ -86,7 +82,7 @@ public function testAuthenticateSuccess()
      */
     public function testAuthenticateSuccessWithCallback()
     {
-        $this->_adapter = new Adapter\DbTable($this->_db, 'users', 'username', 'password', null, function($a, $b){return $a === $b;});
+        $this->_adapter = new Adapter\DbTable($this->_db, 'users', 'username', 'password', null, function ($a, $b) {return $a === $b;});
         $this->_adapter->setIdentity('my_username');
         $this->_adapter->setCredential('my_password');
         $result = $this->_adapter->authenticate();

diff --git a/test/Adapter/DbTable/CredentialTreatmentAdapterTest.php b/test/Adapter/DbTable/CredentialTreatmentAdapterTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\DbTable;
@@ -16,9 +15,6 @@
 use Zend\Db\Sql\Select as DBSelect;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  * @group      Zend_Db_Table
  */

diff --git a/test/Adapter/DbTableTest.php b/test/Adapter/DbTableTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter;
 
 use Zend\Authentication\Adapter;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  * @group      Zend_Db_Table
  */

diff --git a/test/Adapter/DigestTest.php b/test/Adapter/DigestTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter;
@@ -14,9 +13,6 @@
 use Zend\Authentication;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class DigestTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/Http/ApacheResolverTest.php b/test/Adapter/Http/ApacheResolverTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http;
@@ -14,9 +13,6 @@
 use Zend\Authentication\Result as AuthResult;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class ApacheTest extends \PHPUnit_Framework_TestCase
@@ -108,9 +104,6 @@ public function testConstructInvalid()
         $apache = new Apache($this->_badPath);
     }
 
-    /**
-     *
-     */
     public function providePasswordFiles()
     {
         $path = __DIR__ . '/TestAsset';

diff --git a/test/Adapter/Http/AuthTest.php b/test/Adapter/Http/AuthTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http;
@@ -16,9 +15,6 @@
 use Zend\Http\Response;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class AuthTest extends \PHPUnit_Framework_TestCase
@@ -186,7 +182,7 @@ public function testBasicAuthBadCreds()
 
     public function testBasicAuthBadUser()
     {
-        // Attempt Basic Authentication with a nonexistant username and
+        // Attempt Basic Authentication with a nonexistent username and
         // password
 
         // The expected Basic Www-Authenticate header value

diff --git a/test/Adapter/Http/FileResolverTest.php b/test/Adapter/Http/FileResolverTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http;
 
 use Zend\Authentication\Adapter\Http;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class FileTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/Http/ObjectTest.php b/test/Adapter/Http/ObjectTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http;
@@ -18,9 +17,6 @@
 use Zend\Http\Response;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class ObjectTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/Http/ProxyTest.php b/test/Adapter/Http/ProxyTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http;
@@ -16,9 +15,6 @@
 use Zend\Http\Response;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class ProxyTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/Http/TestAsset/BasicAuthObjectResolver.php b/test/Adapter/Http/TestAsset/BasicAuthObjectResolver.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Http\TestAsset;

diff --git a/test/Adapter/Ldap/OfflineTest.php b/test/Adapter/Ldap/OfflineTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Ldap;
@@ -14,9 +13,6 @@
 use Zend\Ldap;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class OfflineTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/Ldap/OnlineTest.php b/test/Adapter/Ldap/OnlineTest.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\Ldap;
@@ -15,9 +14,6 @@
 use Zend\Ldap;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class OnlineTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Adapter/TestAsset/OpenIdResponseHelper.php b/test/Adapter/TestAsset/OpenIdResponseHelper.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_Authentication
  */
 
 namespace ZendTest\Authentication\Adapter\TestAsset;
@@ -15,11 +14,6 @@
 
 OpenId::$exitOnRedirect = false;
 
-/**
- * @category   Zend
- * @package    Zend_Authentication
- * @subpackage UnitTests
- */
 class ResponseHelper extends Response
 {
     private $_canSendHeaders;

diff --git a/test/AuthenticationServiceTest.php b/test/AuthenticationServiceTest.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_Authentication
  */
 
 namespace ZendTest\Authentication;
@@ -14,9 +13,6 @@
 use Zend\Authentication as Auth;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
  * @group      Zend_Auth
  */
 class AuthenticationServiceTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Storage/ChainTest.php b/test/Storage/ChainTest.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_Uri
  */
 
 namespace ZendTest\Authentication\Storage;
@@ -17,9 +16,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 
 /**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage UnitTests
   * @group      Zend_Auth
  */
 class ChainTest extends TestCase

diff --git a/test/TestAsset/SuccessAdapter.php b/test/TestAsset/SuccessAdapter.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_Authentication
  */
 
 namespace ZendTest\Authentication\TestAsset;

diff --git a/test/Validator/AuthenticationTest.php b/test/Validator/AuthenticationTest.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_I18n
  */
 
 namespace ZendTest\Validator;
@@ -16,9 +15,6 @@
 use ZendTest\Authentication as AuthTest;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class AthenticationTest extends \PHPUnit_Framework_TestCase