8000 Merge branch '2.5' into 2.6 · symfony/symfony@667c8c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 667c8c7

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.5' into 2.6
* 2.5: [2.5] silence deprecation notices in new components [TwigBundle] added missing absolute URL in Twig exceptions
2 parents 0a2879e + 771703d commit 667c8c7

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends 'TwigBundle::layout.html.twig' %}
22

33
{% block head %}
4-
<link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
4+
<link href="{{ asset('bundles/framework/css/exception.css', absolute=true) }}" rel="stylesheet" type="text/css" media="all" />
55
{% endblock %}
66

77
{% block title %}

‎src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
syntaxCheck="false"
1212
bootstrap="vendor/autoload.php"
1313
>
14+
<php>
15+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16+
<ini name="error_reporting" value="-16385"/>
17+
</php>
1418
<testsuites>
1519
<testsuite name="Symfony ExpressionLanguage Component Test Suite">
1620
<directory>./Tests/</directory>

‎src/Symfony/Component/Security/Acl/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
syntaxCheck="false"
1212
bootstrap="vendor/autoload.php"
1313
>
14+
<php>
15+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16+
<ini name="error_reporting" value="-16385"/>
17+
</php>
1418
<testsuites>
1519
<testsuite name="Symfony Security Component ACL Test Suite">
1620
<directory>./Tests/</directory>

‎src/Symfony/Component/Security/Core/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
syntaxCheck="false"
1212
bootstrap="vendor/autoload.php"
1313
>
14+
<php>
15+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16+
<ini name="error_reporting" value="-16385"/>
17+
</php>
1418
<testsuites>
1519
<testsuite name="Symfony Security Component Core Test Suite">
1620
<directory>./Tests/</directory>

‎src/Symfony/Component/Security/Csrf/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
syntaxCheck="false"
1212
bootstrap="vendor/autoload.php"
1313
>
14+
<php>
15+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16+
<ini name="error_reporting" value="-16385"/>
17+
</php>
1418
<testsuites>
1519
<testsuite name="Symfony Security Component CSRF Test Suite">
1620
<directory>./Tests/</directory>

‎src/Symfony/Component/Security/Http/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
syntaxCheck="false"
1212
bootstrap="vendor/autoload.php"
1313
>
14+
<php>
15+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16+
<ini name="error_reporting" value="-16385"/>
17+
</php>
1418
<testsuites>
1519
<testsuite name="Symfony Security Component HTTP Test Suite">
1620
<directory>./Tests/</directory>

0 commit comments

Comments
 (0)
0