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-04-30 22:18:46 +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/http-kernel/Tests/Controller/ArgumentResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
@@ -167,10 +167,10 @@ class ArgumentResolverTest extends TestCase

    /**
     * @requires PHP 5.6
-     * @expectedException \InvalidArgumentException
     */
    public function testGetVariadicArgumentsWithoutArrayInRequest()
    {
+        $this->expectException('InvalidArgumentException');
        $request = Request::create('/');
        $request->attributes->set('foo', 'foo');
        $request->attributes->set('bar', 'foo');
@@ -181,10 +181,10 @@ class ArgumentResolverTest extends TestCase

    /**
     * @requires PHP 5.6
-     * @expectedException \InvalidArgumentException
     */
    public function testGetArgumentWithoutArray()
    {
+        $this->expectException('InvalidArgumentException');
        $factory = new ArgumentMetadataFactory();
        $valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
        $resolver = new ArgumentResolver($factory, [$valueResolver]);
@@ -199,11 +199,9 @@ class ArgumentResolverTest extends TestCase
        $resolver->getArguments($request, $controller);
    }

-    /**
-     * @expectedException \RuntimeException
-     */
    public function testIfExceptionIsThrownWhenMissingAnArgument()
    {
+        $this->expectException('RuntimeException');
        $request = Request::create('/');
        $controller = [$this, 'controllerWithFoo'];

@@ -266,11 +264,9 @@ class ArgumentResolverTest extends TestCase
        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
    }

-    /**
-     * @expectedException \RuntimeException
-     */
    public function testGetSessionMissMatchWithInterface()
    {
+        $this->expectException('RuntimeException');
        $session = $this->getMockBuilder(SessionInterface::class)->getMock();
        $request = Request::create('/');
        $request->setSession($session);
@@ -279,11 +275,9 @@ class ArgumentResolverTest extends TestCase
        self::$resolver->getArguments($request, $controller);
    }

-    /**
-     * @expectedException \RuntimeException
-     */
    public function testGetSessionMissMatchWithImplementation()
    {
+        $this->expectException('RuntimeException');
        $session = new Session(new MockArraySessionStorage());
        $request = Request::create('/');
        $request->setSession($session);
@@ -292,11 +286,9 @@ class ArgumentResolverTest extends TestCase
        self::$resolver->getArguments($request, $controller);
    }

-    /**
-     * @expectedException \RuntimeException
-     */
    public function testGetSessionMissMatchOnNull()
    {
+        $this->expectException('RuntimeException');
        $request = Request::create('/');
        $controller = [$this, 'controllerWithExtendingSession'];

--- a/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -112,12 +112,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
        $this->assertSame([NonInstantiableController::class, 'action'], $controller);
    }

-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
-     */
    public function testNonConstructController()
    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
        $container = $this->getMockBuilder(Container::class)->getMock();
        $container->expects($this->at(0))
            ->method('has')
@@ -179,12 +177,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
        $this->assertSame([$service, 'action'], $controller);
    }

-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
-     */
    public function testExceptionWhenUsingRemovedControllerService()
    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
        $container = $this->getMockBuilder(Container::class)->getMock();
        $container->expects($this->at(0))
            ->method('has')
@@ -205,12 +201,10 @@ class ContainerControllerResolverTest extends ControllerResolverTest
        $resolver->getController($request);
    }

-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?
-     */
    public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?');
        $container = $this->getMockBuilder(Container::class)->getMock();
        $container->expects($this->once())
            ->method('has')
@@ -237,12 +231,8 @@ class ContainerControllerResolverTest extends ControllerResolverTest
    {
        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
        $resolver = $this->createControllerResolver();
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exceptionName);
-            $this->expectExceptionMessageRegExp($exceptionMessage);
-        } else {
-            $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
-        }
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessageRegExp($exceptionMessage);

        $request = Request::create('/');
        $request->attributes->set('_controller', $controller);
--- a/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
+++ b/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
@@ -90,11 +90,9 @@ class ControllerResolverTest extends TestCase
        $this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
    }

-    /**
-     * @expectedException \InvalidArgumentException
-     */
    public function testGetControllerOnObjectWithoutInvokeMethod()
    {
+        $this->expectException('InvalidArgumentException');
        $resolver = $this->createControllerResolver();

        $request = Request::create('/');
@@ -118,12 +116,8 @@ class ControllerResolverTest extends TestCase
    public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
    {
        $resolver = $this->createControllerResolver();
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exceptionName);
-            $this->expectExceptionMessage($exceptionMessage);
-        } else {
-            $this->setExpectedException($exceptionName, $exceptionMessage);
-        }
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessage($exceptionMessage);

        $request = Request::create('/');
        $request->attributes->set('_controller', $controller);
@@ -234,11 +228,11 @@ class ControllerResolverTest extends TestCase
    }

    /**
-     * @expectedException \RuntimeException
     * @group legacy
     */
    public function testIfExceptionIsThrownWhenMissingAnArgument()
    {
+        $this->expectException('RuntimeException');
        $resolver = new ControllerResolver();
        $request = Request::create('/');