more improvements

yceruto · yceruto · commit a45af9aa0bdd · 2024-08-29T14:31:07.000-04:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Decorator/DoctrineTransactionDecoratorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Decorator/DoctrineTransactionDecoratorTest.php
@@ -43,34 +43,26 @@ protected function setUp(): void
 
     public function testDecoratorWrapsInTransactionAndFlushes()
     {
-        $this->connection->expects($this->once())
-            ->method('beginTransaction')
-        ;
-        $this->connection->expects($this->once())
-            ->method('commit')
-        ;
-        $this->entityManager->expects($this->once())
-            ->method('flush')
-        ;
-
         $handler = new TestHandler();
+
+        $this->connection->expects($this->once())->method('beginTransaction');
+        $this->connection->expects($this->once())->method('commit');
+        $this->entityManager->expects($this->once())->method('flush');
+
         $result = $this->decorator->call($handler->handle(...));
         $this->assertSame('success', $result);
     }
 
     public function testTransactionIsRolledBackOnException()
     {
-        $this->connection->expects($this->once())
-            ->method('beginTransaction')
-        ;
-        $this->connection->expects($this->once())
-            ->method('rollBack')
-        ;
+        $this->connection->expects($this->once())->method('beginTransaction');
+        $this->connection->expects($this->once())->method('rollBack');
+
+        $handler = new TestHandler();
 
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('A runtime error.');
 
-        $handler = new TestHandler();
         $this->decorator->call($handler->handleWithError(...));
     }
 
@@ -79,11 +71,12 @@ public function testInvalidEntityManagerThrowsException()
         $this->managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
+
+        $handler = new TestHandler();
 
         $this->expectException(\InvalidArgumentException::class);
 
-        $handler = new TestHandler();
         $this->decorator->call($handler->handleWithUnknownManager(...));
     }
 }
diff --git a/src/Symfony/Component/Decorator/Tests/Fixtures/Decorator/Json.php b/src/Symfony/Component/Decorator/Tests/Fixtures/Decorator/Json.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Decorator\Attribute\Decorate;
 
-#[\Attribute(\Attribute::TARGET_FUNCTION | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_METHOD)]
 final class Json extends Decorate
 {
     public function __construct()
diff --git a/src/Symfony/Component/Decorator/Tests/Fixtures/Decorator/Logging.php b/src/Symfony/Component/Decorator/Tests/Fixtures/Decorator/Logging.php
@@ -14,7 +14,7 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\Decorator\Attribute\Decorate;
 
-#[\Attribute(\Attribute::TARGET_FUNCTION | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_FUNCTION | \Attribute::TARGET_METHOD)]
 final class Logging extends Decorate
 {
     public function __construct(
diff --git a/src/Symfony/Component/Decorator/Tests/Fixtures/Handler/Message.php b/src/Symfony/Component/Decorator/Tests/Fixtures/Handler/Message.php
@@ -11,6 +11,6 @@
 
 namespace Symfony\Component\Decorator\Tests\Fixtures\Handler;
 
-final readonly class Message
+final class Message
 {
 }
diff --git a/src/Symfony/Component/Decorator/Tests/Fixtures/Handler/MessageHandler.php b/src/Symfony/Component/Decorator/Tests/Fixtures/Handler/MessageHandler.php
@@ -14,7 +14,7 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\Decorator\Tests\Fixtures\Decorator\Logging;
 
-final readonly class MessageHandler
+final class MessageHandler
 {
     #[Logging]
     public function __invoke(Message $message): Message

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Decorator\Attribute\Decorate;`
`15`	`15`
`16`		`-#[\Attribute(\Attribute::TARGET_FUNCTION \| \Attribute::TARGET_METHOD \| \Attribute::IS_REPEATABLE)]`
	`16`	`+#[\Attribute(\Attribute::TARGET_METHOD)]`
`17`	`17`	`final class Json extends Decorate`
`18`	`18`	`{`
`19`	`19`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Psr\Log\LogLevel;`
`15`	`15`	`use Symfony\Component\Decorator\Attribute\Decorate;`
`16`	`16`
`17`		`-#[\Attribute(\Attribute::TARGET_FUNCTION \| \Attribute::TARGET_METHOD \| \Attribute::IS_REPEATABLE)]`
	`17`	`+#[\Attribute(\Attribute::TARGET_FUNCTION \| \Attribute::TARGET_METHOD)]`
`18`	`18`	`final class Logging extends Decorate`
`19`	`19`	`{`
`20`	`20`	`public function __construct(`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Decorator\Tests\Fixtures\Handler;`
`13`	`13`
`14`		`-final readonly class Message`
	`14`	`+final class Message`
`15`	`15`	`{`
`16`	`16`	`}`