Skip to content

Commit 88d586b

Browse files
committed
Merge branch '2.3' into 2.7
2 parents b178e68 + b23c9a3 commit 88d586b

File tree

5 files changed

+68
-4
lines changed

5 files changed

+68
-4
lines changed

src/Symfony/Bundle/FrameworkBundle/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected function getScript($request)
185185
$code = <<<EOF
186186
<?php
187187
188-
error_reporting($errorReporting & ~E_USER_DEPRECATED);
188+
error_reporting($errorReporting);
189189
190190
if ('$autoloader') {
191191
require_once '$autoloader';

src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public static function setUpBeforeClass()
2626
{
2727
ini_set('session.save_handler', 'files');
2828
ini_set('session.save_path', sys_get_temp_dir());
29-
ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);
3029
}
3130

3231
protected function setUp()

src/Symfony/Component/HttpKernel/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected function getScript($request)
105105
$code = <<<EOF
106106
<?php
107107
108-
error_reporting($errorReporting & ~E_USER_DEPRECATED);
108+
error_reporting($errorReporting);
109109
110110
require_once '$requirePath';
111111

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,74 @@
2424
*/
2525
class PropertyAccessor implements PropertyAccessorInterface
2626
{
27+
/**
28+
* @internal
29+
*/
2730
const VALUE = 0;
31+
32+
/**
33+
* @internal
34+
*/
2835
const IS_REF = 1;
36+
37+
/**
38+
* @internal
39+
*/
2940
const IS_REF_CHAINED = 2;
41+
42+
/**
43+
* @internal
44+
*/
3045
const ACCESS_HAS_PROPERTY = 0;
46+
47+
/**
48+
* @internal
49+
*/
3150
const ACCESS_TYPE = 1;
51+
52+
/**
53+
* @internal
54+
*/
3255
const ACCESS_NAME = 2;
56+
57+
/**
58+
* @internal
59+
*/
3360
const ACCESS_REF = 3;
61+
62+
/**
63+
* @internal
64+
*/
3465
const ACCESS_ADDER = 4;
66+
67+
/**
68+
* @internal
69+
*/
3570
const ACCESS_REMOVER = 5;
71+
72+
/**
73+
* @internal
74+
*/
3675
const ACCESS_TYPE_METHOD = 0;
76+
77+
/**
78+
* @internal
79+
*/
3780
const ACCESS_TYPE_PROPERTY = 1;
81+
82+
/**
83+
* @internal
84+
*/
3885
const ACCESS_TYPE_MAGIC = 2;
86+
87+
/**
88+
* @internal
89+
*/
3990
const ACCESS_TYPE_ADDER_AND_REMOVER = 3;
91+
92+
/**
93+
* @internal
94+
*/
4095
const ACCESS_TYPE_NOT_FOUND = 4;
4196

4297
/**

src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,17 @@
2424
interface AuthenticationEntryPointInterface
2525
{
2626
/**
27-
* Starts the authentication scheme.
27+
* Returns a response that directs the user to authenticate.
28+
*
29+
* This is called when an anonymous request accesses a resource that
30+
* requires authentication. The job of this method is to return some
31+
* response that "helps" the user start into the authentication process.
32+
*
33+
* Examples:
34+
* A) For a form login, you might redirect to the login page
35+
* return new RedirectResponse('/login');
36+
* B) For an API token authentication system, you return a 401 response
37+
* return new Response('Auth header required', 401);
2838
*
2939
* @param Request $request The request that resulted in an AuthenticationException
3040
* @param AuthenticationException $authException The exception that started the authentication process

0 commit comments

Comments
 (0)