Skip to content

Commit 00b85e6

Browse files
committed
Merge branch '2.7'
* 2.7: (65 commits) Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Fix PHP Fatal error: Cannot call constructor in symfony/console/Symfony/Component/Console/Helper/DialogHelper.php on line 37 Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Append to PR #12737 referring Ticket #12704 Issue #12658 Add a deprecation note about Translator's setFallbackLocale... Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... Hackday deprecated 12621 Added deprecation log for validate and validateValue on ExecutionContext... [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method [Validator] Added a deprecation note about setPropertyAccessor #12698 [Locale] Adding a deprecation note about the Locale component ...
2 parents ab38744 + ae1ef66 commit 00b85e6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Normalizer/DenormalizableInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ interface DenormalizableInterface
2828
* recursively all child objects of the implementor.
2929
*
3030
* @param DenormalizerInterface $denormalizer The denormalizer is given so that you
31-
* can use it to denormalize objects contained within this object.
31+
* can use it to denormalize objects contained within this object
3232
* @param array|scalar $data The data from which to re-create the object.
3333
* @param string|null $format The format is optionally given to be able to denormalize differently
34-
* based on different input formats.
35-
* @param array $context options for denormalizing.
34+
* based on different input formats
35+
* @param array $context options for denormalizing
3636
*/
3737
public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
3838
}

phpunit.xml.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
colors="true"
77
bootstrap="vendor/autoload.php"
88
>
9+
<php>
10+
<!-- Disable E_USER_DEPRECATED until 3.0 -->
11+
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
12+
<ini name="error_reporting" value="-16385"/>
13+
</php>
14+
915
<testsuites>
1016
<testsuite name="Symfony Serializer Component Test Suite">
1117
<directory>./Tests/</directory>

0 commit comments

Comments
 (0)