Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5213778

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1'
* 3.1: [VarDumper] Fix indentation trimming in ExceptionCaster [HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer removed @SInCE [Security] fixed DebugAccessDecisionManager::setVoters() Remove and change unrelevant comments in Validator and Security components. [Validator] add missing interface use statement for phpdoc block return type. [Validator] UuidValidator must accept a Uuid constraint. [Validator] make UuidValidator class formatting consistent. Conflicts: src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
2 parents d9f1a72 + e41a352 commit 5213778

File tree

57 files changed

+50
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+50
-158
lines changed

‎UPGRADE-3.1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ FrameworkBundle
9595
HttpKernel
9696
----------
9797

98-
* Passing objects as URI attributes to the ESI and SSI renderers has been
98+
* Passing non-scalar values as URI attributes to the ESI and SSI renderers has been
9999
deprecated and will be removed in Symfony 4.0. The inline fragment
100-
renderer should be used with object attributes.
100+
renderer should be used with non-scalar attributes.
101101

102102
* The `ControllerResolver::getArguments()` method has been deprecated and will
103103
be removed in 4.0. If you have your own `ControllerResolverInterface`

‎UPGRADE-4.0.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ FrameworkBundle
124124
HttpKernel
125125
----------
126126

127-
* Possibility to pass objects as URI attributes to the ESI and SSI renderers
128-
has been removed. The inline fragment renderer should be used with object
129-
attributes.
127+
* Possibility to pass non-scalar values as URI attributes to the ESI and SSI
128+
renderers has been removed. The inline fragment renderer should be used with
129+
non-scalar attributes.
130130

131131
* The `ControllerResolver::getArguments()` method has been removed. If you
132132
have your own `ControllerResolverInterface` implementation, you should

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
117117
* @param string $registerAliasMethodName Name of Configuration class method to
118118
* register alias.
119119
* @param string[] $aliasMap Map of alias to namespace
120-
*
121-
* @since Support for bundle alias was added in Symfony 2.6
122120
*/
123121
public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
124122
{

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
/**
1919
* A utility for reading object IDs.
2020
*
21-
* @since 1.0
22-
*
2321
* @author Bernhard Schussek <[email protected]>
2422
*
2523
* @internal This class is meant for internal use only.

‎src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
/**
1818
* Extension for collecting data of the forms on a page.
1919
*
20-
* @since 2.4
21-
*
2220
* @author Robert Schönthal <[email protected]>
2321
* @author Bernhard Schussek <[email protected]>
2422
*/

‎src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* Listener that invokes a data collector for the {@link FormEvents::POST_SET_DATA}
2121
* and {@link FormEvents::POST_SUBMIT} events.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Bernhard Schussek <[email protected]>
2624
*/
2725
class DataCollectorListener implements EventSubscriberInterface

‎src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
/**
2121
* Data collector for {@link FormInterface} instances.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Robert Schönthal <[email protected]>
2624
* @author Bernhard Schussek <[email protected]>
2725
*/

‎src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
/**
1919
* Collects and structures information about forms.
2020
*
21-
* @since 2.4
22-
*
2321
* @author Bernhard Schussek <[email protected]>
2422
*/
2523
interface FormDataCollectorInterface extends DataCollectorInterface

‎src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Default implementation of {@link FormDataExtractorInterface}.
2121
*
22-
* @since 2.4
23-
*
2422
* @author Bernhard Schussek <[email protected]>
2523
*/
2624
class FormDataExtractor implements FormDataExtractorInterface

‎src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
/**
1818
* Extracts arrays of information out of forms.
1919
*
20-
* @since 2.4
21-
*
2220
* @author Bernhard Schussek <[email protected]>
2321
*/
2422
interface FormDataExtractorInterface

‎src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
/**
2222
* Proxy that invokes a data collector when creating a form and its view.
2323
*
24-
* @since 2.4
25-
*
2624
* @author Bernhard Schussek <[email protected]>
2725
*/
2826
class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface

‎src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* Proxy that wraps resolved types into {@link ResolvedTypeDataCollectorProxy}
2121
* instances.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Bernhard Schussek <[email protected]>
2624
*/
2725
class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface

‎src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Type extension for collecting data of a form with this type.
2121
*
22-
* @since 2.4
23-
*
2422
* @author Robert Schönthal <[email protected]>
2523
* @author Bernhard Schussek <[email protected]>
2624
*/

‎src/Symfony/Component/Form/FormErrorIterator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
* flatten the recursive structure into a flat list of errors.
2828
*
2929
* @author Bernhard Schussek <[email protected]>
30-
*
31-
* @since 2.5
3230
*/
3331
class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable
3432
{

‎src/Symfony/Component/Form/FormInterface.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ public function all();
102102
*
103103
* @return FormErrorIterator An iterator over the {@link FormError}
104104
* instances that where added to this form
105-
*
106-
* @since 2.5 Since version 2.5 this method returns a
107-
* {@link FormErrorIterator} instance instead of an array
108105
*/
109106
public function getErrors($deep = false, $flatten = true);
110107

‎src/Symfony/Component/Form/Test/FormPerformanceTestCase.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ public function setMaxRunningTime($maxRunningTime)
6262
}
6363

6464
/**
65-
* @since Method available since Release 2.3.0
66-
*
6765
* @return int
6866
*/
6967
public function getMaxRunningTime()

‎src/Symfony/Component/Form/Util/OrderedHashMap.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
* }
6464
*
6565
* @author Bernhard Schussek <[email protected]>
66-
*
67-
* @since 2.2.6
6866
*/
6967
class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable
7068
{
@@ -93,8 +91,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable
9391
* Creates a new map.
9492
*
9593
* @param array $elements The elements to insert initially
96-
*
97-
* @since 2.2.6
9894
*/
9995
public function __construct(array $elements = array())
10096
{
@@ -104,8 +100,6 @@ public function __construct(array $elements = array())
104100

105101
/**
106102
* {@inheritdoc}
107-
*
108-
* @since 2.2.6
109103
*/
110104
public function offsetExists($key)
111105
{
@@ -114,8 +108,6 @@ public function offsetExists($key)
114108

115109
/**
116110
* {@inheritdoc}
117-
*
118-
* @since 2.2.6
119111
*/
120112
public function offsetGet($key)
121113
{
@@ -128,8 +120,6 @@ public function offsetGet($key)
128120

129121
/**
130122
* {@inheritdoc}
131-
*
132-
* @since 2.2.6
133123
*/
134124
public function offsetSet($key, $value)
135125
{
@@ -151,8 +141,6 @@ public function offsetSet($key, $value)
151141

152142
/**
153143
* {@inheritdoc}
154-
*
155-
* @since 2.2.6
156144
*/
157145
public function offsetUnset($key)
158146
{
@@ -170,8 +158,6 @@ public function offsetUnset($key)
170158

171159
/**
172160
* {@inheritdoc}
173-
*
174-
* @since 2.2.6
175161
*/
176162
public function getIterator()
177163
{
@@ -180,8 +166,6 @@ public function getIterator()
180166

181167
/**
182168
* {@inheritdoc}
183-
*
184-
* @since 2.2.6
185169
*/
186170
public function count()
187171
{

‎src/Symfony/Component/Form/Util/OrderedHashMapIterator.php

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
* This class is internal and should not be used.
1818
*
1919
* @author Bernhard Schussek <[email protected]>
20-
*
21-
* @since 2.2.6
2220
*/
2321
class OrderedHashMapIterator implements \Iterator
2422
{
@@ -69,8 +67,6 @@ class OrderedHashMapIterator implements \Iterator
6967
* This array is managed by the corresponding
7068
* {@link OrderedHashMap} instance to support
7169
* recognizing the deletion of elements.
72-
*
73-
* @since 2.2.6
7470
*/
7571
public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
7672
{
@@ -85,8 +81,6 @@ public function __construct(array &$elements, array &$orderedKeys, array &$manag
8581
/**
8682
* Removes the iterator's cursors from the managed cursors of the
8783
* corresponding {@link OrderedHashMap} instance.
88-
*
89-
* @since 2.2.6
9084
*/
9185
public function __destruct()
9286
{
@@ -96,9 +90,7 @@ public function __destruct()
9690
}
9791

9892
/**
99-
*{@inheritdoc}
100-
*
101-
* @since 2.2.6
93+
* {@inheritdoc}
10294
*/
10395
public function current()
10496
{
@@ -107,8 +99,6 @@ public function current()
10799

108100
/**
109101
* {@inheritdoc}
110-
*
111-
* @since 2.2.6
112102
*/
113103
public function next()
114104
{
@@ -124,29 +114,23 @@ public function next()
124114
}
125115

126116
/**
127-
*{@inheritdoc}
128-
*
129-
* @since 2.2.6
117+
* {@inheritdoc}
130118
*/
131119
public function key()
132120
{
133121
return $this->key;
134122
}
135123

136124
/**
137-
*{@inheritdoc}
138-
*
139-
* @since 2.2.6
125+
* {@inheritdoc}
140126
*/
141127
public function valid()
142128
{
143129
return null !== $this->key;
144130
}
145131

146132
/**
147-
*{@inheritdoc}
148-
*
149-
* @since 2.2.6
133+
* {@inheritdoc}
150134
*/
151135
public function rewind()
152136
{

‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function render($uri, Request $request, array $options = array())
6565
{
6666
if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
6767
if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) {
68-
@trigger_error('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);
68+
@trigger_error('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);
6969
}
7070

7171
return $this->inlineStrategy->render($uri, $request, $options);

‎src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
6262
*/
6363
public function setVoters(array $voters)
6464
{
65-
if (!$this->manager instanceof AccessDecisionManager) {
65+
if (!method_exists($this->manager, 'setVoters')) {
6666
return;
6767
}
6868

‎src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
/**
1515
* Manages CSRF tokens.
1616
*
17-
* @since 2.4
18-
*
1917
* @author Bernhard Schussek <[email protected]>
2018
*/
2119
interface CsrfTokenManagerInterface

‎src/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
/**
1515
* Generates CSRF tokens.
1616
*
17-
* @since 2.4
18-
*
1917
* @author Bernhard Schussek <[email protected]>
2018
*/
2119
interface TokenGeneratorInterface

‎src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
/**
1515
* Generates CSRF tokens.
1616
*
17-
* @since 2.4
18-
*
1917
* @author Bernhard Schussek <[email protected]>
2018
*/
2119
class UriSafeTokenGenerator implements TokenGeneratorInterface

‎src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
/**
1717
* Token storage that uses PHP's native session handling.
1818
*
19-
* @since 2.4
20-
*
2119
* @author Bernhard Schussek <[email protected]>
2220
*/
2321
class NativeSessionTokenStorage implements TokenStorageInterface

‎src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException;
1616

1717
/**
18-
* Token storage that uses a Symfony2 Session object.
19-
*
20-
* @since 2.4
18+
* Token storage that uses a Symfony Session object.
2119
*
2220
* @author Bernhard Schussek <[email protected]>
2321
*/

‎src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
/**
1515
* Stores CSRF tokens.
1616
*
17-
* @since 2.4
18-
*
1917
* @author Bernhard Schussek <[email protected]>
2018
*/
2119
interface TokenStorageInterface

‎src/Symfony/Component/Validator/Constraint.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ public function __set($option, $value)
207207
* @throws InvalidOptionsException If an invalid option name is given
208208
*
209209
* @internal This method should not be used or overwritten in userland code.
210-
*
211-
* @since 2.6
212210
*/
213211
public function __get($option)
214212
{
@@ -296,8 +294,6 @@ public function getTargets()
296294
* @internal This method may be replaced by an implementation of
297295
* {@link \Serializable} in the future. Please don't use or
298296
* overwrite it.
299-
*
300-
* @since 2.6
301297
*/
302298
public function __sleep()
303299
{

0 commit comments

Comments
 (0)