Merge branch '2.8' into 3.3

* 2.8: PHP CS Fixer: clean up repo and adjust config Dumper shouldn't use html format for phpdbg [Validator] Fix access to root object when using composite constraint
Merge branch '2.7' into 2.8
2026-03-25 01:32:09 +01:00 · 2018-01-03 18:13:53 +01:00 · 2018-01-03 18:12:09 +01:00 · 2018-01-03 18:10:39 +01:00 · 2018-01-03 18:10:15 +01:00 · 2018-01-03 08:37:11 +01:00
9 changed files with 18 additions and 8 deletions
--- a/Exception/ContextErrorException.php
+++ b/Exception/ContextErrorException.php
@@ -33,7 +33,7 @@ class ContextErrorException extends \ErrorException
     */
    public function getContext()
    {
-        @trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);

        return $this->context;
    }
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/Resources/ext/tests/001.phpt
+++ b/Resources/ext/tests/001.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_zval_info API
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
 --FILE--
 <?php

--- a/Resources/ext/tests/002.phpt
+++ b/Resources/ext/tests/002.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_debug_backtrace in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
 --FILE--
 <?php

--- a/Resources/ext/tests/002_1.phpt
+++ b/Resources/ext/tests/002_1.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_debug_backtrace in case of non fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
 --FILE--
 <?php

--- a/Resources/ext/tests/003.phpt
+++ b/Resources/ext/tests/003.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test ErrorHandler in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
 --FILE--
 <?php

--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -261,6 +261,7 @@ class FlattenExceptionTest extends TestCase

    public function testRecursionInArguments()
    {
+        $a = null;
        $a = array('foo', array(2, &$a));
        $exception = $this->createException($a);

--- a/Tests/phpt/exception_rethrown.phpt
+++ b/Tests/phpt/exception_rethrown.phpt
@@ -26,7 +26,6 @@ ErrorHandler::register()->setDefaultLogger(new TestLogger());
 ini_set('display_errors', 1);

 throw new \Exception('foo');
-
 ?>
 --EXPECTF--
 Uncaught Exception: foo
--- a/Tests/phpt/fatal_with_nested_handlers.phpt
+++ b/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -24,7 +24,9 @@ var_dump(array(
 $eHandler[0]->setExceptionHandler('print_r');

 if (true) {
-    class Broken implements \Serializable {};
+    class Broken implements \Serializable
+    {
+    }
 }

 ?>
Author	SHA1	Message	Date
Nicolas Grekas	7f2d1c75f6	Merge branch '2.8' into 3.3 * 2.8: PHP CS Fixer: clean up repo and adjust config Dumper shouldn't use html format for phpdbg [Validator] Fix access to root object when using composite constraint	2018-01-03 18:13:53 +01:00
Nicolas Grekas	546db6f2bf	Merge branch '2.7' into 2.8 * 2.7: PHP CS Fixer: clean up repo and adjust config Dumper shouldn't use html format for phpdbg [Validator] Fix access to root object when using composite constraint	2018-01-03 18:12:09 +01:00
Nicolas Grekas	ff9e8cb401	minor #25653 PHP CS Fixer: clean up repo and adjust config (keradus) This PR was squashed before being merged into the 2.7 branch (closes #25653). Discussion ---------- PHP CS Fixer: clean up repo and adjust config \| Q \| A \| ------------- \| --- \| Branch? \| 2.7 \| Bug fix? \| no \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| n/a \| Fixed tickets \| n/a \| License \| MIT \| Doc PR \| n/a Reason for this PR is that one want to have `php-cs-fixer fix -v` command executed without changes that shall not be applied for this repo. To achieve that, we need to groom config to exclude files that violate CS willingly, fix files that are violating CS unwillingly, and deliver missing case handling at PHP CS Fixer itself (https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3359) (already merged!). Commits ------- b14cbc1 PHP CS Fixer: clean up repo and adjust config	2018-01-03 18:10:39 +01:00
Dariusz	e46133c70d	PHP CS Fixer: clean up repo and adjust config	2018-01-03 18:10:15 +01:00
Fabien Potencier	7f4478ce1c	Merge branch '2.8' into 3.3 * 2.8: fixed years in copyright	2018-01-03 08:37:11 +01:00
Fabien Potencier	c617cfc32e	Merge branch '2.7' into 2.8 * 2.7: fixed years in copyright	2018-01-03 08:36:31 +01:00
Fabien Potencier	526150f1a8	fixed years in copyright	2018-01-03 08:23:28 +01:00
Nicolas Grekas	b8c44f3906	Merge branch '2.8' into 3.3 * 2.8: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files Update LICENSE year... forever	2018-01-02 16:47:19 +01:00
Nicolas Grekas	5f44cab999	Merge branch '2.7' into 2.8 * 2.7: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files Update LICENSE year... forever	2018-01-02 16:45:49 +01:00
Kévin Dunglas	79c3d84f0b	Update LICENSE year... forever	2017-12-31 13:13:41 +01:00
Fabien Potencier	c5ba0ded9d	fixed some deprecation messages	2017-12-31 06:50:45 +01:00
Fabien Potencier	22c18d44e7	fixed some deprecation messages	2017-12-31 06:12:25 +01:00
Fabien Potencier	79b7f987a6	Merge branch '2.7' into 2.8 * 2.7: fixed some deprecation messages	2017-12-31 06:04:01 +01:00
Fabien Potencier	12370d9f98	fixed some deprecation messages	2017-12-31 05:55:05 +01:00
Fabien Potencier	0972e3f262	Merge branch '2.7' into 2.8 * 2.7: [2.7][DX] Use constant message contextualisation for deprecations	2017-12-31 05:16:51 +01:00
Romain Neutron	177a0b9b35	[2.7][DX] Use constant message contextualisation for deprecations	2017-12-20 15:36:51 +01:00
Nicolas Grekas	b16f5f7634	Merge branch '2.8' into 3.3 * 2.8: [2.7] Fix issues found by PHPStan Add php_unit_dedicate_assert to PHPCS improve FormType::getType exception message details [Intl] Update ICU data to 60.2 [Console] fix a bug when you are passing a default value and passing -n would ouput the index	2017-12-20 12:04:02 +01:00
Nicolas Grekas	4f43301e60	Merge branch '2.7' into 2.8 * 2.7: [2.7] Fix issues found by PHPStan Add php_unit_dedicate_assert to PHPCS [Intl] Update ICU data to 60.2 [Console] fix a bug when you are passing a default value and passing -n would ouput the index	2017-12-20 11:59:01 +01:00
Dalibor Karlović	1086f33dba	[2.7] Fix issues found by PHPStan	2017-12-20 10:28:52 +01:00