Remove ControllerEvent::addAttribute()

nicolas-grekas · nicolas-grekas · commit 09f291f1f47a · 2022-07-05T22:54:37.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php
@@ -73,9 +73,4 @@ public function getAttributes(): array
     {
         return $this->controllerEvent->getAttributes();
     }
-
-    public function addAttribute(object $attribute, bool $replace = false): void
-    {
-        $this->controllerEvent->addAttribute($attribute, $replace);
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
@@ -79,21 +79,10 @@ public function getAttributes(): array
 
         foreach (array_merge($class?->getAttributes() ?? [], $action->getAttributes()) as $attribute) {
             if (class_exists($attribute->getName())) {
-                $this->addAttribute($attribute->newInstance());
+                $this->attributes[$attribute->getName()][] = $attribute->newInstance();
             }
         }
 
         return $this->attributes;
     }
-
-    public function addAttribute(object $attribute, bool $replace = false): void
-    {
-        if (!isset($this->attributes)) {
-            $this->getAttributes();
-        }
-        if ($replace) {
-            $this->attributes[$attribute::class] = [];
-        }
-        $this->attributes[$attribute::class][] = $attribute;
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Event/ControllerArgumentsEventTest.php b/src/Symfony/Component/HttpKernel/Tests/Event/ControllerArgumentsEventTest.php
@@ -14,10 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
-use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Attribute\Bar;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\AttributeController;
 use Symfony\Component\HttpKernel\Tests\TestHttpKernel;
 
 class ControllerArgumentsEventTest extends TestCase
@@ -36,29 +33,4 @@ public function testSetAttributes()
 
         $this->assertSame([], $event->getAttributes());
     }
-
-    public function testGetAttributes()
-    {
-        $controller = new AttributeController();
-        $request = new Request();
-
-        $controllerEvent = new ControllerEvent(new TestHttpKernel(), $controller, $request, HttpKernelInterface::MAIN_REQUEST);
-
-        $event = new ControllerArgumentsEvent(new TestHttpKernel(), $controllerEvent, ['test'], new Request(), HttpKernelInterface::MAIN_REQUEST);
-
-        $expected = [
-            Bar::class => [
-                new Bar('class'),
-                new Bar('method'),
-            ],
-        ];
-
-        $this->assertEquals($expected, $event->getAttributes());
-
-        $event->addAttribute(new Bar('foo'));
-
-        $expected[Bar::class][] = new Bar('foo');
-        $this->assertEquals($expected, $event->getAttributes());
-        $this->assertSame($controllerEvent->getAttributes(), $event->getAttributes());
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Event/ControllerEventTest.php b/src/Symfony/Component/HttpKernel/Tests/Event/ControllerEventTest.php
@@ -32,27 +32,6 @@ public function testSetAttributes()
         $this->assertSame([], $event->getAttributes());
     }
 
-    public function testAddAttribute()
-    {
-        $request = new Request();
-        $request->attributes->set('_controller_reflectors', [1, 2]);
-        $controller = [new AttributeController(), 'action'];
-        $event = new ControllerEvent(new TestHttpKernel(), $controller, $request, HttpKernelInterface::MAIN_REQUEST);
-
-        $expected = [Bar::class => [new Bar('class')]];
-        $this->assertEquals($expected, $event->getAttributes());
-
-        $event->addAttribute(new Bar('class2'));
-
-        $expected[Bar::class][] = new Bar('class2');
-        $this->assertEquals($expected, $event->getAttributes());
-
-        $event->addAttribute(new Bar('class3'), true);
-
-        $expected = [Bar::class => [new Bar('class3')]];
-        $this->assertEquals($expected, $event->getAttributes());
-    }
-
     /**
      * @dataProvider provideGetAttributes
      */

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,4 @@ public function getAttributes(): array`
`73`	`73`	`{`
`74`	`74`	`return $this->controllerEvent->getAttributes();`
`75`	`75`	`}`
`76`		`-`
`77`		`- public function addAttribute(object $attribute, bool $replace = false): void`
`78`		`- {`
`79`		`- $this->controllerEvent->addAttribute($attribute, $replace);`
`80`		`- }`
`81`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,21 +79,10 @@ public function getAttributes(): array`
`79`	`79`
`80`	`80`	`foreach (array_merge($class?->getAttributes() ?? [], $action->getAttributes()) as $attribute) {`
`81`	`81`	`if (class_exists($attribute->getName())) {`
`82`		`- $this->addAttribute($attribute->newInstance());`
	`82`	`+ $this->attributes[$attribute->getName()][] = $attribute->newInstance();`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`return $this->attributes;`
`87`	`87`	`}`
`88`		`-`
`89`		`- public function addAttribute(object $attribute, bool $replace = false): void`
`90`		`- {`
`91`		`- if (!isset($this->attributes)) {`
`92`		`- $this->getAttributes();`
`93`		`- }`
`94`		`- if ($replace) {`
`95`		`- $this->attributes[$attribute::class] = [];`
`96`		`- }`
`97`		`- $this->attributes[$attribute::class][] = $attribute;`
`98`		`- }`
`99`	`88`	`}`