Merge branch '2.3' into 2.7

This commit is contained in:
Tobias Schultze 2015-12-15 02:31:17 +01:00
commit 88d586b447
5 changed files with 68 additions and 4 deletions

View File

@ -185,7 +185,7 @@ class Client extends BaseClient
$code = <<<EOF
<?php
error_reporting($errorReporting & ~E_USER_DEPRECATED);
error_reporting($errorReporting);
if ('$autoloader') {
require_once '$autoloader';

View File

@ -26,7 +26,6 @@ class LegacyDefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase
{
ini_set('session.save_handler', 'files');
ini_set('session.save_path', sys_get_temp_dir());
ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);
}
protected function setUp()

View File

@ -105,7 +105,7 @@ class Client extends BaseClient
$code = <<<EOF
<?php
error_reporting($errorReporting & ~E_USER_DEPRECATED);
error_reporting($errorReporting);
require_once '$requirePath';

View File

@ -24,19 +24,74 @@ use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
*/
class PropertyAccessor implements PropertyAccessorInterface
{
/**
* @internal
*/
const VALUE = 0;
/**
* @internal
*/
const IS_REF = 1;
/**
* @internal
*/
const IS_REF_CHAINED = 2;
/**
* @internal
*/
const ACCESS_HAS_PROPERTY = 0;
/**
* @internal
*/
const ACCESS_TYPE = 1;
/**
* @internal
*/
const ACCESS_NAME = 2;
/**
* @internal
*/
const ACCESS_REF = 3;
/**
* @internal
*/
const ACCESS_ADDER = 4;
/**
* @internal
*/
const ACCESS_REMOVER = 5;
/**
* @internal
*/
const ACCESS_TYPE_METHOD = 0;
/**
* @internal
*/
const ACCESS_TYPE_PROPERTY = 1;
/**
* @internal
*/
const ACCESS_TYPE_MAGIC = 2;
/**
* @internal
*/
const ACCESS_TYPE_ADDER_AND_REMOVER = 3;
/**
* @internal
*/
const ACCESS_TYPE_NOT_FOUND = 4;
/**

View File

@ -24,7 +24,17 @@ use Symfony\Component\HttpFoundation\Response;
interface AuthenticationEntryPointInterface
{
/**
* Starts the authentication scheme.
* Returns a response that directs the user to authenticate.
*
* This is called when an anonymous request accesses a resource that
* requires authentication. The job of this method is to return some
* response that "helps" the user start into the authentication process.
*
* Examples:
* A) For a form login, you might redirect to the login page
* return new RedirectResponse('/login');
* B) For an API token authentication system, you return a 401 response
* return new Response('Auth header required', 401);
*
* @param Request $request The request that resulted in an AuthenticationException
* @param AuthenticationException $authException The exception that started the authentication process