Updating Symfony lib and dependencies:

Package operations: 2 installs, 23 updates, 0 removals - Updating psr/log (1.1.0 => 1.1.2) - Updating symfony/debug (v3.4.30 => v3.4.35) - Updating symfony/console (v3.4.30 => v3.4.35) - Updating symfony/dotenv (v3.4.30 => v3.4.35) - Updating symfony/routing (v3.4.30 => v3.4.35) - Updating symfony/finder (v3.4.30 => v3.4.35) - Updating symfony/filesystem (v3.4.30 => v3.4.35) - Installing symfony/polyfill-util (v1.12.0) - Installing symfony/polyfill-php56 (v1.12.0) - Updating symfony/http-foundation (v3.4.30 => v3.4.35) - Updating symfony/event-dispatcher (v3.4.30 => v3.4.35) - Updating symfony/http-kernel (v3.4.30 => v3.4.35) - Updating symfony/config (v3.4.30 => v3.4.35) - Updating symfony/dependency-injection (v3.4.30 => v3.4.35) - Updating symfony/class-loader (v3.4.30 => v3.4.35) - Updating symfony/cache (v3.4.30 => v3.4.35) - Updating symfony/framework-bundle (v3.4.30 => v3.4.35) - Updating twig/twig (v1.42.2 => v1.42.4) - Updating symfony/twig-bridge (v3.4.30 => v3.4.35) - Updating symfony/twig-bundle (v3.4.30 => v3.4.35) - Updating symfony/yaml (v3.4.30 => v3.4.35) - Updating symfony/stopwatch (v3.4.30 => v3.4.35) - Updating symfony/var-dumper (v3.4.30 => v3.4.35) - Updating symfony/web-profiler-bundle (v3.4.30 => v3.4.35) - Updating symfony/css-selector (v3.4.30 => v3.4.35)
2026-05-01 14:38:47 +02:00 · 2019-11-18 18:04:32 +01:00
parent 532eb466a1
commit c76cccd2e7
633 changed files with 4154 additions and 4093 deletions
--- a/lib/symfony/debug/Tests/DebugClassLoaderTest.php
+++ b/lib/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -59,12 +59,10 @@ class DebugClassLoaderTest extends TestCase
        $this->fail('DebugClassLoader did not register');
    }

-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage boo
-     */
    public function testThrowingClass()
    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('boo');
        try {
            class_exists(__NAMESPACE__.'\Fixtures\Throwing');
            $this->fail('Exception expected');
@@ -139,21 +137,17 @@ class DebugClassLoaderTest extends TestCase
        }
    }

-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Case mismatch between loaded and declared class names
-     */
    public function testNameCaseMismatch()
    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
        class_exists(__NAMESPACE__.'\TestingCaseMismatch', true);
    }

-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Case mismatch between class and real file names
-     */
    public function testFileCaseMismatch()
    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between class and real file names');
        if (!file_exists(__DIR__.'/Fixtures/CaseMismatch.php')) {
            $this->markTestSkipped('Can only be run on case insensitive filesystems');
        }
@@ -161,12 +155,10 @@ class DebugClassLoaderTest extends TestCase
        class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true);
    }

-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Case mismatch between loaded and declared class names
-     */
    public function testPsr4CaseMismatch()
    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
        class_exists(__NAMESPACE__.'\Fixtures\Psr4CaseMismatch', true);
    }

@@ -447,5 +439,7 @@ class ClassLoader
        } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
        }
+
+        return null;
    }
 }
--- a/lib/symfony/debug/Tests/ErrorHandlerTest.php
+++ b/lib/symfony/debug/Tests/ErrorHandlerTest.php
@@ -283,6 +283,10 @@ class ErrorHandlerTest extends TestCase

    public function testHandleUserError()
    {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 allows __toString to throw exceptions');
+        }
+
        try {
            $handler = ErrorHandler::register();
            $handler->throwAt(0, true);
@@ -573,11 +577,11 @@ class ErrorHandlerTest extends TestCase
    }

    /**
-     * @expectedException \Exception
     * @group no-hhvm
     */
    public function testCustomExceptionHandler()
    {
+        $this->expectException('Exception');
        $handler = new ErrorHandler();
        $handler->setExceptionHandler(function ($e) use ($handler) {
            $handler->handleException($e);
--- a/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php
+++ b/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php
@@ -256,7 +256,7 @@ class FlattenExceptionTest extends TestCase

        // assertEquals() does not like NAN values.
        $this->assertEquals($array[$i][0], 'float');
-        $this->assertTrue(is_nan($array[$i++][1]));
+        $this->assertNan($array[$i][1]);
    }

    public function testRecursionInArguments()
@@ -267,7 +267,7 @@ class FlattenExceptionTest extends TestCase

        $flattened = FlattenException::create($exception);
        $trace = $flattened->getTrace();
-        $this->assertContains('*DEEP NESTED ARRAY*', serialize($trace));
+        $this->assertStringContainsString('*DEEP NESTED ARRAY*', serialize($trace));
    }

    public function testTooBigArray()
@@ -291,8 +291,8 @@ class FlattenExceptionTest extends TestCase

        $serializeTrace = serialize($trace);

-        $this->assertContains('*SKIPPED over 10000 entries*', $serializeTrace);
-        $this->assertNotContains('*value1*', $serializeTrace);
+        $this->assertStringContainsString('*SKIPPED over 10000 entries*', $serializeTrace);
+        $this->assertStringNotContainsString('*value1*', $serializeTrace);
    }

    private function createException($foo)
--- a/lib/symfony/debug/Tests/ExceptionHandlerTest.php
+++ b/lib/symfony/debug/Tests/ExceptionHandlerTest.php
@@ -39,8 +39,8 @@ class ExceptionHandlerTest extends TestCase
        $handler->sendPhpResponse(new \RuntimeException('Foo'));
        $response = ob_get_clean();

-        $this->assertContains('Whoops, looks like something went wrong.', $response);
-        $this->assertNotContains('<div class="trace trace-as-html">', $response);
+        $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+        $this->assertStringNotContainsString('<div class="trace trace-as-html">', $response);

        $handler = new ExceptionHandler(true);

@@ -48,8 +48,8 @@ class ExceptionHandlerTest extends TestCase
        $handler->sendPhpResponse(new \RuntimeException('Foo'));
        $response = ob_get_clean();

-        $this->assertContains('Whoops, looks like something went wrong.', $response);
-        $this->assertContains('<div class="trace trace-as-html">', $response);
+        $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+        $this->assertStringContainsString('<div class="trace trace-as-html">', $response);
    }

    public function testStatusCode()
@@ -60,7 +60,7 @@ class ExceptionHandlerTest extends TestCase
        $handler->sendPhpResponse(new NotFoundHttpException('Foo'));
        $response = ob_get_clean();

-        $this->assertContains('Sorry, the page you are looking for could not be found.', $response);
+        $this->assertStringContainsString('Sorry, the page you are looking for could not be found.', $response);

        $expectedHeaders = [
            ['HTTP/1.0 404', true, null],
@@ -116,7 +116,7 @@ class ExceptionHandlerTest extends TestCase
        });

        $handler->handle(new \Exception());
-        ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/bug.php?id=76563
+        ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/76563
        $this->assertSame('ccc', ob_get_clean());
    }

@@ -157,7 +157,7 @@ class ExceptionHandlerTest extends TestCase

    private function assertThatTheExceptionWasOutput($content, $expectedClass, $expectedTitle, $expectedMessage)
    {
-        $this->assertContains(sprintf('<span class="exception_title"><abbr title="%s">%s</abbr></span>', $expectedClass, $expectedTitle), $content);
-        $this->assertContains(sprintf('<p class="break-long-words trace-message">%s</p>', $expectedMessage), $content);
+        $this->assertStringContainsString(sprintf('<span class="exception_title"><abbr title="%s">%s</abbr></span>', $expectedClass, $expectedTitle), $content);
+        $this->assertStringContainsString(sprintf('<p class="break-long-words trace-message">%s</p>', $expectedMessage), $content);
    }
 }