Merge branch '2.7' into 2.8

* 2.7: [DI] minor docblock fixes
[DI] minor docblock fixes
2026-03-25 17:52:07 +01:00 · 2017-10-24 15:48:52 +02:00 · 2017-10-24 13:40:19 +02:00 · 2017-10-18 07:57:21 -07:00 · 2017-10-13 19:28:12 +02:00 · 2017-10-10 09:42:03 +02:00
4 changed files with 8 additions and 17 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -203,18 +203,11 @@ class DebugClassLoader
            } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
                self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
            } else {
-                if (2 > $len = 1 + (strpos($name, '\\', 1 + strpos($name, '\\')) ?: strpos($name, '_'))) {
+                if (2 > $len = 1 + (strpos($name, '\\') ?: strpos($name, '_'))) {
                    $len = 0;
                    $ns = '';
                } else {
-                    switch ($ns = substr($name, 0, $len)) {
-                        case 'Symfony\Bridge\\':
-                        case 'Symfony\Bundle\\':
-                        case 'Symfony\Component\\':
-                            $ns = 'Symfony\\';
-                            $len = strlen($ns);
-                            break;
-                    }
+                    $ns = substr($name, 0, $len);
                }
                $parent = get_parent_class($class);

--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -153,8 +153,6 @@ class ExceptionHandler
     * If you have the Symfony HttpFoundation component installed,
     * this method will use it to create and send the response. If not,
     * it will fallback to plain PHP functions.
-     *
-     * @param \Exception $exception An \Exception instance
     */
    private function failSafeHandle(\Exception $exception)
    {
@@ -238,8 +236,6 @@ class ExceptionHandler
    /**
     * Gets the HTML content associated with the given exception.
     *
-     * @param FlattenException $exception A FlattenException instance
-     *
     * @return string The content as a string
     */
    public function getContent(FlattenException $exception)
@@ -306,8 +302,6 @@ EOF;
    /**
     * Gets the stylesheet associated with the given exception.
     *
-     * @param FlattenException $exception A FlattenException instance
-     *
     * @return string The stylesheet as a string
     */
    public function getStylesheet(FlattenException $exception)
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -80,7 +80,9 @@ class ErrorHandlerTest extends TestCase
            $this->assertEquals(E_NOTICE, $exception->getSeverity());
            $this->assertEquals(__FILE__, $exception->getFile());
            $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
-            $this->assertArrayHasKey('foobar', $exception->getContext());
+            if (\PHP_VERSION_ID < 70200) {
+                $this->assertArrayHasKey('foobar', $exception->getContext());
+            }

            $trace = $exception->getTrace();
            $this->assertEquals(__FILE__, $trace[0]['file']);
--- a/Tests/Fixtures/Throwing.php
+++ b/Tests/Fixtures/Throwing.php
@@ -1,3 +1,5 @@
 <?php

-throw new \Exception('boo');
+if (!function_exists('__phpunit_run_isolated_test')) {
+    throw new \Exception('boo');
+}
Author	SHA1	Message	Date
Nicolas Grekas	a0a29e9867	Merge branch '2.7' into 2.8 * 2.7: [DI] minor docblock fixes	2017-10-24 15:48:52 +02:00
Nicolas Grekas	271c75c24d	[DI] minor docblock fixes	2017-10-24 13:40:19 +02:00
Fabien Potencier	08bf2c53db	Merge branch '2.7' into 2.8 * 2.7: Username and password in basic auth are allowed to contain '.' Remove obsolete PHPDoc from UriSigner [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed pdo session fix Fixed unsetting from loosely equal keys OrderedHashMap [Debug] Fix same vendor detection in class loader Updated the source text and translation reject remember-me token if user check fails	2017-10-18 07:57:21 -07:00
hubert.lenoir	f0546da70c	[Debug] Fix same vendor detection in class loader	2017-10-13 19:28:12 +02:00
Nicolas Grekas	d295479508	Merge branch '2.7' into 2.8 * 2.7: Fix 7.2 compat layer Fix PHP 7.2 support [HttpFoundation] Add missing session.lazy_write config option [HttpFoundation] Combine Cache-Control headers [Form] fix parsing invalid floating point numbers Escape command usage when displaying it in the text descriptor Use for=ID on radio/checkbox label.	2017-10-10 09:42:03 +02:00
Nicolas Grekas	d2d11379b5	Fix 7.2 compat layer	2017-10-09 20:05:34 +02:00