Allow Symfony 7 (#1409)

nicolas-grekas · web-flow · commit 8c4c5b08a521 · 2023-05-30T10:43:50.000+02:00
* Allow Symfony 7

* Fix PHPUnit deprecations
diff --git a/composer.json b/composer.json
@@ -11,9 +11,9 @@
         "ext-hash": "*",
         "ext-json": "*",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0",
+        "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0",
         "symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/process": "^4.4 || ^5.0 || ^6.0",
+        "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
@@ -32,15 +32,15 @@
         "nyholm/symfony-bundle-test": "1.x-dev#0555e4898e1b05655a4bdf52ba10c7f56611a514 as 1.9.0",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "swaggest/json-diff": "^3.7",
-        "symfony/cache": "^4.4 || ^5.0 || ^6.0",
-        "symfony/config": "^4.4 || ^5.0 || ^6.0",
-        "symfony/console": "^4.4 || ^5.0 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
+        "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/filesystem": "^5.0 || ^6.0",
-        "symfony/finder": "^4.4 || ^5.0 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "^5.3",
+        "symfony/filesystem": "^5.0 || ^6.0 || ^7.0",
+        "symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0",
         "symfony/polyfill-uuid": "^1.0"
     },
     "conflict": {
diff --git a/src/CodeGenerator/composer.json b/src/CodeGenerator/composer.json
@@ -11,10 +11,10 @@
         "friendsofphp/php-cs-fixer": "^2.16",
         "nette/php-generator": "^3.3",
         "nette/utils": "^3.0",
-        "symfony/console": "^4.4 || ^5.0 || ^6.0",
-        "symfony/http-client": "^4.4 || ^5.0 || ^6.0",
+        "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/process": "^4.4 || ^5.0 || ^6.0",
+        "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/service-contracts": "^2.0 || ^3.0"
     },
     "autoload": {
diff --git a/src/CodeGenerator/src/Command/GenerateCommand.php b/src/CodeGenerator/src/Command/GenerateCommand.php
@@ -16,6 +16,7 @@
 use PhpCsFixer\Runner\Runner;
 use PhpCsFixer\ToolInfo;
 use Swaggest\JsonDiff\JsonPatch;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -30,6 +31,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
+#[AsCommand(name: 'generate', description: 'Create or update API client methods.', aliases: ['update'])]
 class GenerateCommand extends Command
 {
     protected static $defaultName = 'generate';
@@ -69,7 +71,7 @@ protected function configure()
         ]);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var ConsoleOutputInterface $output */
         $io = new SymfonyStyle($input, $output);
diff --git a/src/Core/composer.json b/src/Core/composer.json
@@ -18,7 +18,7 @@
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0",
+        "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0",
         "symfony/http-client-contracts": "^1.1.8 || ^2.0 || ^3.0",
         "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0"
     },
diff --git a/src/Integration/Flysystem/S3/composer.json b/src/Integration/Flysystem/S3/composer.json
@@ -25,7 +25,7 @@
         "league/mime-type-detection": "^1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.3"
+        "symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Integration/Symfony/Bundle/composer.json b/src/Integration/Symfony/Bundle/composer.json
@@ -14,9 +14,9 @@
     "require": {
         "php": "^7.2.5 || ^8.0",
         "async-aws/core": "^1.0",
-        "symfony/config": "^4.4 || ^5.0 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0"
+        "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "async-aws/s3": "^1.0",
@@ -25,7 +25,7 @@
         "async-aws/ssm": "^1.0",
         "matthiasnoback/symfony-config-test": "^4.1",
         "nyholm/symfony-bundle-test": "1.x-dev#0555e4898e1b05655a4bdf52ba10c7f56611a514 as 1.9.0",
-        "symfony/cache": "^4.4 || ^5.0 || ^6.0"
+        "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Service/CloudFormation/tests/Integration/CloudFormationClientTest.php b/src/Service/CloudFormation/tests/Integration/CloudFormationClientTest.php
@@ -45,7 +45,7 @@ public function testDescribeStackEvents(): void
         ]);
         $result = $client->DescribeStackEvents($input);
 
-        self::assertCount(0, $result->getStackEvents());
+        self::assertCount(0, iterator_to_array($result->getStackEvents()));
         self::assertNull($result->getNextToken());
     }
 
diff --git a/src/Service/DynamoDb/tests/Unit/Result/ListTablesOutputTest.php b/src/Service/DynamoDb/tests/Unit/Result/ListTablesOutputTest.php
@@ -32,7 +32,7 @@ public function testListTablesOutput(): void
 
             break;
         }
-        self::assertCount(4, $tableNames);
+        self::assertCount(4, iterator_to_array($tableNames));
         self::assertNull($result->getLastEvaluatedTableName());
     }
 }
diff --git a/src/Service/DynamoDb/tests/Unit/Result/ScanOutputTest.php b/src/Service/DynamoDb/tests/Unit/Result/ScanOutputTest.php
@@ -52,7 +52,7 @@ public function testScanOutput(): void
             break;
         }
 
-        self::assertCount(2, $items);
+        self::assertCount(2, iterator_to_array($items));
         self::assertSame(2, $result->getCount());
         self::assertSame(3, $result->getScannedCount());
     }
diff --git a/src/Service/Iam/tests/Unit/Result/ListUsersResponseTest.php b/src/Service/Iam/tests/Unit/Result/ListUsersResponseTest.php
@@ -47,8 +47,9 @@ public function testListUsersResponse(): void
         $result = new ListUsersResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()), new IamClient(), new ListUsersRequest());
 
         self::assertFalse($result->getIsTruncated());
-        self::assertCount(2, $result->getUsers(true));
-        self::assertSame('Juan', iterator_to_array($result->getUsers())[0]->getUserName());
-        self::assertSame('Anika', iterator_to_array($result->getUsers())[1]->getUserName());
+        $users = iterator_to_array($result->getUsers(true));
+        self::assertCount(2, $users);
+        self::assertSame('Juan', $users[0]->getUserName());
+        self::assertSame('Anika', $users[1]->getUserName());
     }
 }
diff --git a/src/Service/Kinesis/tests/Integration/KinesisClientTest.php b/src/Service/Kinesis/tests/Integration/KinesisClientTest.php
@@ -327,8 +327,9 @@ public function testListStreamConsumers(): void
 
         $result->resolve();
 
-        self::assertCount(1, $result->getConsumers());
-        self::assertSame('demo', iterator_to_array($result->getConsumers())[0]->getConsumerName());
+        $consumers = iterator_to_array($result->getConsumers());
+        self::assertCount(1, $consumers);
+        self::assertSame('demo', $consumers[0]->getConsumerName());
     }
 
     public function testListStreams(): void
@@ -341,8 +342,9 @@ public function testListStreams(): void
         $input = new ListStreamsInput([]);
         $result = $client->listStreams($input);
 
-        self::assertGreaterThanOrEqual(1, iterator_to_array($result->getStreamNames()));
-        self::assertContains(__FUNCTION__, iterator_to_array($result->getStreamNames()));
+        $streamNames = iterator_to_array($result->getStreamNames());
+        self::assertGreaterThanOrEqual(1, \count($streamNames));
+        self::assertContains(__FUNCTION__, $streamNames);
     }
 
     public function testListTagsForStream(): void
diff --git a/src/Service/Kinesis/tests/Unit/Result/ListStreamConsumersOutputTest.php b/src/Service/Kinesis/tests/Unit/Result/ListStreamConsumersOutputTest.php
@@ -32,7 +32,8 @@ public function testListStreamConsumersOutput(): void
         $result = new ListStreamConsumersOutput(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()), new KinesisClient(), new ListStreamConsumersInput([]));
 
         // self::assertTODO(expected, $result->getConsumers());
-        self::assertCount(1, $result->getConsumers(true));
-        self::assertSame('arn', iterator_to_array($result->getConsumers(true))[0]->getConsumerArn());
+        $consumers = iterator_to_array($result->getConsumers(true));
+        self::assertCount(1, $consumers);
+        self::assertSame('arn', $consumers[0]->getConsumerArn());
     }
 }
diff --git a/src/Service/Route53/tests/Integration/Route53ClientTest.php b/src/Service/Route53/tests/Integration/Route53ClientTest.php
@@ -221,7 +221,7 @@ public function testListResourceRecordSets(): void
 
         $result->resolve();
 
-        self::assertCount(2, $result->getResourceRecordSets());
+        self::assertCount(2, iterator_to_array($result->getResourceRecordSets()));
         self::assertFalse($result->getIsTruncated());
         self::assertNull($result->getNextRecordName());
     }
diff --git a/src/Service/Route53/tests/Unit/Result/ListResourceRecordSetsResponseTest.php b/src/Service/Route53/tests/Unit/Result/ListResourceRecordSetsResponseTest.php
@@ -40,7 +40,7 @@ public function testListResourceRecordSetsResponse(): void
         $client = new MockHttpClient($response);
         $result = new ListResourceRecordSetsResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()), new Route53Client(), new ListResourceRecordSetsRequest());
 
-        self::assertCount(1, $result->getResourceRecordSets());
+        self::assertCount(1, iterator_to_array($result->getResourceRecordSets()));
         self::assertFalse($result->getIsTruncated());
         self::assertNull($result->getNextRecordName());
         self::assertNull($result->getNextRecordType());
diff --git a/src/Service/S3/tests/Unit/Result/ListObjectsV2OutputTest.php b/src/Service/S3/tests/Unit/Result/ListObjectsV2OutputTest.php
@@ -60,6 +60,6 @@ public function testNoObjects()
         $result = new ListObjectsV2Output(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         $content = $result->getContents(true);
-        self::assertCount(0, $content);
+        self::assertCount(0, iterator_to_array($content));
     }
 }
diff --git a/src/Service/Sns/tests/Integration/SnsClientTest.php b/src/Service/Sns/tests/Integration/SnsClientTest.php
@@ -118,9 +118,9 @@ public function testListSubscriptionsByTopic(): void
         ]);
         $result = $client->ListSubscriptionsByTopic($input);
 
-        self::assertCount(1, $result->getSubscriptions());
-        $subscription = iterator_to_array($result->getSubscriptions())[0];
-        self::assertSame('http://async-aws.com', $subscription->getEndpoint());
+        $subscriptions = iterator_to_array($result->getSubscriptions());
+        self::assertCount(1, $subscriptions);
+        self::assertSame('http://async-aws.com', $subscriptions[0]->getEndpoint());
     }
 
     public function testPublish(): void
diff --git a/src/Service/Ssm/tests/Unit/Result/GetParametersByPathResultTest.php b/src/Service/Ssm/tests/Unit/Result/GetParametersByPathResultTest.php
@@ -55,9 +55,10 @@ public function testGetParametersByPathResult(): void
         $client = new MockHttpClient($response);
         $result = new GetParametersByPathResult(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()), new SsmClient(), new GetParametersByPathRequest());
 
-        self::assertCount(5, $result->getParameters(true));
-        self::assertInstanceOf(Parameter::class, iterator_to_array($result->getParameters())[0]);
-        self::assertSame('/Branch312/Dev/Engineer1', iterator_to_array($result->getParameters())[0]->getName());
+        $parameters = iterator_to_array($result->getParameters(true));
+        self::assertCount(5, $parameters);
+        self::assertInstanceOf(Parameter::class, $parameters[0]);
+        self::assertSame('/Branch312/Dev/Engineer1', $parameters[0]->getName());
         self::assertCount(5, iterator_to_array($result));
         self::assertInstanceOf(Parameter::class, iterator_to_array($result)[0]);
     }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use PhpCsFixer\Runner\Runner;`
`17`	`17`	`use PhpCsFixer\ToolInfo;`
`18`	`18`	`use Swaggest\JsonDiff\JsonPatch;`
	`19`	`+use Symfony\Component\Console\Attribute\AsCommand;`
`19`	`20`	`use Symfony\Component\Console\Command\Command;`
`20`	`21`	`use Symfony\Component\Console\Input\InputArgument;`
`21`	`22`	`use Symfony\Component\Console\Input\InputInterface;`
`@@ -30,6 +31,7 @@`
`30`	`31`	`*`
`31`	`32`	`* @author Tobias Nyholm <[email protected]>`
`32`	`33`	`*/`
	`34`	`+#[AsCommand(name: 'generate', description: 'Create or update API client methods.', aliases: ['update'])]`
`33`	`35`	`class GenerateCommand extends Command`
`34`	`36`	`{`
`35`	`37`	`protected static $defaultName = 'generate';`
`@@ -69,7 +71,7 @@ protected function configure()`
`69`	`71`	`]);`
`70`	`72`	`}`
`71`	`73`
`72`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`74`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`73`	`75`	`{`
`74`	`76`	`/** @var ConsoleOutputInterface $output */`
`75`	`77`	`$io = new SymfonyStyle($input, $output);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testDescribeStackEvents(): void`
`45`	`45`	`]);`
`46`	`46`	`$result = $client->DescribeStackEvents($input);`
`47`	`47`
`48`		`- self::assertCount(0, $result->getStackEvents());`
	`48`	`+ self::assertCount(0, iterator_to_array($result->getStackEvents()));`
`49`	`49`	`self::assertNull($result->getNextToken());`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testListTablesOutput(): void`
`32`	`32`
`33`	`33`	`break;`
`34`	`34`	`}`
`35`		`- self::assertCount(4, $tableNames);`
	`35`	`+ self::assertCount(4, iterator_to_array($tableNames));`
`36`	`36`	`self::assertNull($result->getLastEvaluatedTableName());`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testScanOutput(): void`
`52`	`52`	`break;`
`53`	`53`	`}`
`54`	`54`
`55`		`- self::assertCount(2, $items);`
	`55`	`+ self::assertCount(2, iterator_to_array($items));`
`56`	`56`	`self::assertSame(2, $result->getCount());`
`57`	`57`	`self::assertSame(3, $result->getScannedCount());`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,9 @@ public function testListUsersResponse(): void`
`47`	`47`	`$result = new ListUsersResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()), new IamClient(), new ListUsersRequest());`
`48`	`48`
`49`	`49`	`self::assertFalse($result->getIsTruncated());`
`50`		`- self::assertCount(2, $result->getUsers(true));`
`51`		`- self::assertSame('Juan', iterator_to_array($result->getUsers())[0]->getUserName());`
`52`		`- self::assertSame('Anika', iterator_to_array($result->getUsers())[1]->getUserName());`
	`50`	`+ $users = iterator_to_array($result->getUsers(true));`
	`51`	`+ self::assertCount(2, $users);`
	`52`	`+ self::assertSame('Juan', $users[0]->getUserName());`
	`53`	`+ self::assertSame('Anika', $users[1]->getUserName());`
`53`	`54`	`}`
`54`	`55`	`}`