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' of github.com:zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 11, 2013
47 parents 186ebc9 + 3af3a6e + 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 + a79175d + 3d17935 commit 3355853
Show file tree
Hide file tree
Showing 35 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/Adapter/AdapterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/DbTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -98,7 +98,7 @@ class DbTable implements AdapterInterface
* different credentials. Default is FALSE and need to be set to true to
* allow ambiguity usage.
*
* @var boolean
* @var bool
*/
protected $ambiguityIdentity = false;

Expand Down Expand Up @@ -265,7 +265,7 @@ public function getDbSelect()
*
* @param string|array $returnColumns
* @param string|array $omitColumns
* @return stdClass|boolean
* @return stdClass|bool
*/
public function getResultRowObject($returnColumns = null, $omitColumns = null)
{
Expand Down Expand Up @@ -339,7 +339,7 @@ public function authenticate()
* required pieces of information.
*
* @throws Exception\RuntimeException in the event that setup was not done properly
* @return boolean
* @return bool
*/
protected function _authenticateSetup()
{
Expand Down Expand Up @@ -431,7 +431,7 @@ protected function _authenticateQuerySelect(DbSelect $dbSelect)
* certain that only one record was returned in the resultset
*
* @param array $resultIdentities
* @return boolean|\Zend\Authentication\Result
* @return bool|\Zend\Authentication\Result
*/
protected function _authenticateValidateResultSet(array $resultIdentities)
{
Expand Down
8 changes: 4 additions & 4 deletions src/Adapter/Digest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -185,9 +185,9 @@ public function authenticate()
'identity' => array(
'realm' => $this->realm,
'username' => $this->username,
),
),
'messages' => array()
);
);

while (($line = fgets($fileHandle)) !== false) {
$line = trim($line);
Expand Down Expand Up @@ -226,7 +226,7 @@ protected function _secureStringCompare($a, $b)
return false;
}
$result = 0;
for ($i = 0; $i < strlen($a); $i++) {
for ($i = 0, $len = strlen($a); $i < $len; $i++) {
$result |= ord($a[$i]) ^ ord($b[$i]);
}
return $result == 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Exception/UnexpectedValueException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Adapter/Http.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -95,7 +95,7 @@ class Http implements AdapterInterface
/**
* Whether to send the opaque value in the header. True by default
*
* @var boolean
* @var bool
*/
protected $useOpaque;

Expand Down Expand Up @@ -126,14 +126,14 @@ class Http implements AdapterInterface
* Whether or not to do Proxy Authentication instead of origin server
* authentication (send 407's instead of 401's). Off by default.
*
* @var boolean
* @var bool
*/
protected $imaProxy;

/**
* Flag indicating the client is IE and didn't bother to return the opaque string
*
* @var boolean
* @var bool
*/
protected $ieNoOpaque;

Expand Down Expand Up @@ -819,7 +819,7 @@ protected function _secureStringCompare($a, $b)
return false;
}
$result = 0;
for ($i = 0; $i < strlen($a); $i++) {
for ($i = 0, $len = strlen($a); $i < $len; $i++) {
$result |= ord($a[$i]) ^ ord($b[$i]);
}
return $result == 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Http/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Http/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Http/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Http/FileResolver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Http/ResolverInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Adapter/Ldap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -452,7 +452,7 @@ protected function checkGroupMembership(ZendLdap\Ldap $ldap, $canonicalName, $dn
*
* @param array $returnAttribs
* @param array $omitAttribs
* @return stdClass|boolean
* @return stdClass|bool
*/
public function getAccountObject(array $returnAttribs = array(), array $omitAttribs = array())
{
Expand Down
4 changes: 2 additions & 2 deletions src/AuthenticationService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -132,7 +132,7 @@ public function authenticate(Adapter\AdapterInterface $adapter = null)
/**
* Returns true if and only if an identity is available from storage
*
* @return boolean
* @return bool
*/
public function hasIdentity()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/UnexpectedValueException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Result.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -94,7 +94,7 @@ public function __construct($code, $identity, array $messages = array())
/**
* Returns whether the result represents a successful authentication attempt
*
* @return boolean
* @return bool
*/
public function isValid()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/NonPersistent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -31,7 +31,7 @@ class NonPersistent implements StorageInterface
/**
* Returns true if and only if storage is empty
*
* @return boolean
* @return bool
*/
public function isEmpty()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Session.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down Expand Up @@ -92,7 +92,7 @@ public function getMember()
/**
* Defined by Zend\Authentication\Storage\StorageInterface
*
* @return boolean
* @return bool
*/
public function isEmpty()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/StorageInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand All @@ -21,7 +21,7 @@ interface StorageInterface
* Returns true if and only if storage is empty
*
* @throws \Zend\Authentication\Exception\ExceptionInterface If it is impossible to determine whether storage is empty
* @return boolean
* @return bool
*/
public function isEmpty();

Expand Down
2 changes: 1 addition & 1 deletion test/Adapter/DbTableTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Adapter/DigestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Adapter/Http/AuthTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Adapter/Http/FileResolverTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/Adapter/Http/ObjectTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
*/
Expand Down
Loading

0 comments on commit 3355853

Please sign in to comment.