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

Commit

Permalink
Merge branch 'master' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
176 parents 3efc3e6 + fbe1bf7 + 599bb28 + a1894dc + 5d1b205 + 09ba436 + f8fc5b0 + 17494e9 + 91105ad + e3a1818 + a31ffcc + 370a890 + 79102c3 + 0d79e94 + c3f023e + 7ee4fbe + 7c5f46f + 93e1c5e + 300993b + 3fa60b1 + 56e7a3b + f66fb69 + 65e3dc5 + 893db4e + 1f95227 + 37eba61 + a8a134d + 2a58e81 + c687156 + ff43991 + bad6a8b + aba47b0 + 955d97a + 2b78fdc + 0094c19 + 4985e6d + d904244 + 52367d8 + dce778a + 2305c94 + 052b9a4 + ef11064 + 4efb47c + b3dcf28 + 778fbea + cdde9b4 + 6ade9b9 + 435888b + 2ad89a8 + e232251 + 5932189 + d0360d2 + 52242e5 + 3804b57 + 1cecc58 + 4a4065c + f9b61b5 + 0a07b63 + 0e321e0 + 95ceb90 + 4380d08 + ec9c36c + 4de92b2 + b6eb950 + fca746d + ff69119 + 5351804 + 3617ea6 + 24c8a1f + 0aa6c03 + b24267c + beadb3c + 51c4ced + d92ccc9 + eb1f131 + f383de1 + abc631a + 666ec86 + e22a167 + bb8b8f6 + b55f760 + f23a913 + 9ba9f17 + d01f94f + 9c4e0cc + 63c4a7e + 9eedf95 + 980bffb + 03cf7b3 + 8bbf35d + aff3454 + 1c6567c + a102513 + 90b7795 + 286539e + 7f08291 + 417d368 + ae0f13d + 7894420 + 8ff1b30 + 55ca16f + 0c6cb6c + 7010e32 + 745a36a + f021693 + cd91ba2 + 5586879 + 1cd9259 + b611b41 + e07e054 + 7657d67 + 52b6014 + 00211c2 + 0d594de + f919c63 + 7e217f4 + 3e0da00 + 3723e41 + facd3ee + 4d8294f + 3cdb12a + f09df31 + 34e6a86 + 4e1b451 + 2d3566a + ef9466a + 3c172af + 2260c5e + dd964bc + f325c01 + 3cd4478 + dc3a58e + cf0af6f + 6e93d7b + 6b3eedb + ce63e39 + 1bd656e + cc16778 + 720b563 + 039e86a + b27a1fe + 88022d1 + b4847de + 1b48124 + 6a22f1e + b63de1e + 770056f + 9e9a6cb + f6a6b75 + 9533639 + 82f2194 + 1c82c93 + b2d0ea0 + 65cd119 + b2e527d + 513214f + 3a8340e + 251bd01 + 6cd974a + 8a9cfe7 + c0ef35c + a4120f3 + 83998db + ce6e83d + 79d9ad3 + 06667fc + e9a0a25 + 4d8e4f7 + 46af048 + f8de14f + 5bd58ff + 8a45042 + 476e819 + ec53915 + dabe526 + 1fb31ae commit 024bfa8
Show file tree
Hide file tree
Showing 19 changed files with 12 additions and 69 deletions.
4 changes: 2 additions & 2 deletions src/Config/SessionConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class SessionConfig extends StandardConfig
* @param string $storageName
* @param mixed $storageValue
* @return SessionConfig
* @throws \InvalidArgumentException
* @throws Exception\InvalidArgumentException
*/
public function setStorageOption($storageName, $storageValue)
{
Expand All @@ -87,7 +87,7 @@ public function setStorageOption($storageName, $storageValue)

$result = ini_set($key, $storageValue);
if (FALSE === $result) {
throw new \InvalidArgumentException("'" . $key .
throw new Exception\InvalidArgumentException("'" . $key .
"' is not a valid sessions-related ini setting.");
}
return $this;
Expand Down
12 changes: 4 additions & 8 deletions src/Service/ContainerAbstractServiceFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,15 @@
* <code>
* return array(
* 'session_containers' => array(
* 'auth',
* 'user',
* 'captcha',
* 'SessionContainer\sample',
* 'my_sample_session_container',
* 'MySessionContainer',
* ),
* );
* </code>
*
* Services use the prefix "SessionContainer\\":
*
* <code>
* $container = $services->get('SessionContainer\captcha');
* $container = $services->get('MySessionContainer');
* </code>
*/
class ContainerAbstractServiceFactory implements AbstractFactoryInterface
Expand Down Expand Up @@ -139,8 +137,6 @@ protected function getSessionManager(ServiceLocatorInterface $services)
/**
* Normalize the container name in order to perform a lookup
*
* Strips off the "SessionContainer\" prefix, and lowercases the name.
*
* @param string $name
* @return string
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Config/SessionConfigTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;

use Zend\Session\Config\SessionConfig;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @runTestsInSeparateProcesses
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Config/StandardConfigTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;

use Zend\Session\Config\StandardConfig;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class StandardConfigTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ContainerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;
Expand All @@ -16,9 +15,6 @@
use Zend\Session;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class ContainerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/SaveHandler/CacheTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\SaveHandler;
Expand All @@ -18,9 +17,6 @@
* Unit testing for DbTable include all tests for
* regular session handling
*
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @group Zend_Cache
*/
Expand Down
4 changes: 0 additions & 4 deletions test/SaveHandler/DbTableGatewayOptionsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\SaveHandler;
Expand All @@ -15,9 +14,6 @@
/**
* Unit testing for DbTableGatewayOptions
*
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class DbTableGatewayOptionsTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/SaveHandler/DbTableGatewayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\SaveHandler;
Expand All @@ -19,9 +18,6 @@
* Unit testing for DbTableGateway include all tests for
* regular session handling
*
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @group Zend_Db_Table
*/
Expand Down
4 changes: 0 additions & 4 deletions test/SaveHandler/MongoDBOptionsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,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_Session
*/

namespace ZendTest\Session\SaveHandler;

use Zend\Session\SaveHandler\MongoDBOptions;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class MongoDBOptionsTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/SaveHandler/MongoDBTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\SaveHandler;
Expand All @@ -15,9 +14,6 @@
use Zend\Session\SaveHandler\MongoDBOptions;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class MongoDBTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/SessionArrayStorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;
Expand All @@ -15,9 +14,6 @@
use Zend\Session\Container;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class SessionArrayStorageTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/SessionManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;
Expand All @@ -14,9 +13,6 @@
use Zend\Session;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @preserveGlobalState disabled
*/
Expand Down
4 changes: 0 additions & 4 deletions test/SessionStorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;
Expand All @@ -14,9 +13,6 @@
use Zend\Session\Storage\ArrayStorage;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class SessionStorageTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/StorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session;

use Zend\Session\Storage\ArrayStorage;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class StorageTest extends \PHPUnit_Framework_TestCase
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/TestFailingValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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_Session
*/

namespace ZendTest\Session\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/TestManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/TestSaveHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/TestSaveHandlerWithValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\TestAsset;
Expand Down
13 changes: 6 additions & 7 deletions test/Validator/RemoteAddrTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_Session
*/

namespace ZendTest\Session\Validator;

use Zend\Session\Validator\RemoteAddr;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
*/
class RemoteAddrTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -89,6 +85,7 @@ public function testHttpXForwardedFor()
$_SERVER['REMOTE_ADDR'] = '0.1.2.3';
$_SERVER['HTTP_X_FORWARDED_FOR'] = '1.1.2.3';
RemoteAddr::setUseProxy(true);
RemoteAddr::setTrustedProxies(array('0.1.2.3'));
$validator = new RemoteAddr();
$this->assertEquals('1.1.2.3', $validator->getData());
$this->restore();
Expand All @@ -101,6 +98,7 @@ public function testHttpClientIp()
$_SERVER['HTTP_X_FORWARDED_FOR'] = '1.1.2.3';
$_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3';
RemoteAddr::setUseProxy(true);
RemoteAddr::setTrustedProxies(array('0.1.2.3'));
$validator = new RemoteAddr();
$this->assertEquals('2.1.2.3', $validator->getData());
$this->restore();
Expand All @@ -112,6 +110,7 @@ public function testUsesRightMostAddressWhenMultipleHttpXForwardedForAddressesPr
$_SERVER['REMOTE_ADDR'] = '0.1.2.3';
$_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
RemoteAddr::setUseProxy(true);
RemoteAddr::setTrustedProxies(array('0.1.2.3'));
$validator = new RemoteAddr();
$this->assertEquals('1.1.2.3', $validator->getData());
$this->restore();
Expand All @@ -125,14 +124,14 @@ public function testShouldNotUseClientIpHeaderToTestProxyCapabilitiesByDefault()
$_SERVER['HTTP_CLIENT_IP'] = '0.1.2.4';
RemoteAddr::setUseProxy(true);
$validator = new RemoteAddr();
$this->assertEquals('1.1.2.3', $validator->getData());
$this->assertEquals('0.1.2.3', $validator->getData());
$this->restore();
}

public function testWillOmitTrustedProxyIpsFromXForwardedForMatching()
{
$this->backup();
$_SERVER['REMOTE_ADDR'] = '0.1.2.3';
$_SERVER['REMOTE_ADDR'] = '1.1.2.3';
$_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
RemoteAddr::setUseProxy(true);
RemoteAddr::setTrustedProxies(array('1.1.2.3'));
Expand All @@ -150,7 +149,7 @@ public function testCanSpecifyWhichHeaderToUseStatically()
RemoteAddr::setUseProxy(true);
RemoteAddr::setProxyHeader('Client-Ip');
$validator = new RemoteAddr();
$this->assertEquals('0.1.2.4', $validator->getData());
$this->assertEquals('0.1.2.3', $validator->getData());
$this->restore();
}
}

0 comments on commit 024bfa8

Please sign in to comment.