Merge branch 'master' into symfony-7

andrew-demb · andrew-demb · commit de1eb05c6858 · 2024-12-31T16:34:41.000+01:00
# Conflicts:
#	.travis.yml
#	composer.json
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 [![Latest Unstable Version](https://poser.pugx.org/thecodingmachine/graphqlite-bundle/v/unstable)](https://packagist.org/packages/thecodingmachine/graphqlite-bundle)
 [![License](https://poser.pugx.org/thecodingmachine/graphqlite-bundle/license)](https://packagist.org/packages/thecodingmachine/graphqlite-bundle)
 [![Build Status](https://travis-ci.org/thecodingmachine/graphqlite-bundle.svg?branch=master)](https://travis-ci.org/thecodingmachine/graphqlite-bundle)
-[![Coverage Status](https://coveralls.io/repos/thecodingmachine/graphqlite-bundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/thecodingmachine/graphqlite-bundle?branch=master)
 
 
 # GraphQLite bundle
diff --git a/composer.json b/composer.json
@@ -27,15 +27,14 @@
     "symfony/translation": "^6.4 || ^7",
     "symfony/psr-http-message-bridge": "^2.0 || ^7.0",
     "nyholm/psr7": "^1.1",
-    "laminas/laminas-diactoros": "^2.2.2 || ^3.0",
+    "laminas/laminas-diactoros": "^2.2.2 || ^3",
     "overblog/graphiql-bundle": "^0.2 || ^0.3 || ^1",
     "thecodingmachine/cache-utils": "^1"
   },
   "require-dev": {
     "symfony/security-bundle": "^6.4 || ^7",
     "symfony/yaml": "^6.4 || ^7",
     "beberlei/porpaginas": "^1.2 || ^2.0",
-    "php-coveralls/php-coveralls": "^2.1.0",
     "symfony/phpunit-bridge": "^6.4 || ^7",
     "phpstan/phpstan": "^1.8",
     "composer/package-versions-deprecated": "^1.8",
diff --git a/src/Command/DumpSchemaCommand.php b/src/Command/DumpSchemaCommand.php
@@ -43,7 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        $schemaExport = SchemaPrinterForGraphQLite::doPrint($this->schema, ['sortTypes' => true]);
+        $schemaExport = SchemaPrinterForGraphQLite::doPrint($this->schema, ['sortTypes' => true, 'sortFields' => true]);
 
         $filename = $input->getOption('output');
         if (\is_string($filename)) {
diff --git a/tests/Command/DumpSchemaCommandTest.php b/tests/Command/DumpSchemaCommandTest.php
@@ -19,7 +19,7 @@ public function testExecute(): void
         $commandTester->execute([]);
 
         self::assertMatchesRegularExpression(
-            '/type Product {[\s"]*seller: Contact\s*name: String!\s*price: Float!\s*}/',
+            '/type Product {[\s"]*name: String!\s*price: Float!\s*seller: Contact\s*}/',
             $commandTester->getDisplay()
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`43`	`43`	`{`
`44`	`44`	`$io = new SymfonyStyle($input, $output);`
`45`	`45`
`46`		`- $schemaExport = SchemaPrinterForGraphQLite::doPrint($this->schema, ['sortTypes' => true]);`
	`46`	`+ $schemaExport = SchemaPrinterForGraphQLite::doPrint($this->schema, ['sortTypes' => true, 'sortFields' => true]);`
`47`	`47`
`48`	`48`	`$filename = $input->getOption('output');`
`49`	`49`	`if (\is_string($filename)) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function testExecute(): void`
`19`	`19`	`$commandTester->execute([]);`
`20`	`20`
`21`	`21`	`self::assertMatchesRegularExpression(`
`22`		`- '/type Product {[\s"]seller: Contact\sname: String!\sprice: Float!\s}/',`
	`22`	`+ '/type Product {[\s"]name: String!\sprice: Float!\sseller: Contact\s}/',`
`23`	`23`	`$commandTester->getDisplay()`
`24`	`24`	`);`
`25`	`25`	`}`