Merge pull request #621 from mcg-web/symfony_5

Add support for Symfony 5

Author: mcg-web

.travis.yml

@@ -44,22 +44,18 @@ jobs:
  env: SYMFONY_VERSION=3.4.*
  - php: 7.3
  env: SYMFONY_VERSION=4.1.*
- - php: 7.3
- env: SYMFONY_VERSION=4.2.*
- - php: 7.3
- env: SYMFONY_VERSION=4.3.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
- - php: 7.3
- env: SYMFONY_VERSION=4.4.* STABILITY=dev SYMFONY_DEPRECATIONS_HELPER=max[total]=0
- - php: 7.3
- env: SYMFONY_VERSION=5.0.* STABILITY=dev SYMFONY_DEPRECATIONS_HELPER=max[total]=0
  - php: 7.4snapshot
  env: SYMFONY_VERSION=4.3.*
+ - php: 7.3
+ env: SYMFONY_VERSION=4.4.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
+ - php: 7.3
+ env: SYMFONY_VERSION=5.0.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
  - php: nightly
  env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
 
  - stage: Code Quality
  php: 7.2
- env: COVERAGE
+ env: COVERAGE SYMFONY_VERSION=4.4.*
  before_script:
  - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
  - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
@@ -70,7 +66,7 @@ jobs:
 
  - stage: Code Quality
  php: 7.2
- env: STATIC_ANALYSIS
+ env: STATIC_ANALYSIS SYMFONY_VERSION=4.3.*
  install: travis_retry composer install --prefer-dist
  script: composer static-analysis
 
@@ -86,8 +82,3 @@ jobs:
 
  allow_failures:
  - php: nightly
- - php: 7.4snapshot
- - php: 7.3
- env: SYMFONY_VERSION=4.4.* STABILITY=dev SYMFONY_DEPRECATIONS_HELPER=max[total]=0
- - php: 7.3
- env: SYMFONY_VERSION=5.0.* STABILITY=dev SYMFONY_DEPRECATIONS_HELPER=max[total]=0

composer.json

@@ -30,13 +30,13 @@
  "require": {
  "php": ">=5.6",
  "psr/log": "^1.0",
- "symfony/config": "^3.1 || ^4.0",
- "symfony/dependency-injection": "^3.1 || ^4.0",
- "symfony/event-dispatcher": "^3.1 || ^4.0",
- "symfony/expression-language": "^3.1 || ^4.0",
- "symfony/framework-bundle": "^3.1 || ^4.0",
- "symfony/options-resolver": "^3.1 || ^4.0",
- "symfony/property-access": "^3.1 || ^4.0",
+ "symfony/config": "^3.1 || ^4.0 || ^5.0",
+ "symfony/dependency-injection": "^3.1 || ^4.0 || ^5.0",
+ "symfony/event-dispatcher": "^3.1 || ^4.0 || ^5.0",
+ "symfony/expression-language": "^3.1 || ^4.0 || ^5.0",
+ "symfony/framework-bundle": "^3.1 || ^4.0 || ^5.0",
+ "symfony/options-resolver": "^3.1 || ^4.0 || ^5.0",
+ "symfony/property-access": "^3.1 || ^4.0 || ^5.0",
  "webonyx/graphql-php": "^0.11.2 || ^0.12.0 || ^0.13.0"
  },
  "replace": {
@@ -50,14 +50,14 @@
  "require-dev": {
  "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.2",
  "react/promise": "^2.5",
- "symfony/asset": "^3.1 || ^4.0",
- "symfony/browser-kit": "^3.1 || ^4.0",
- "symfony/console": "^3.1 || ^4.0",
- "symfony/css-selector": "^3.1 || ^4.0",
- "symfony/phpunit-bridge": "^3.1 || ^4.0",
- "symfony/process": "^3.1 || ^4.0",
- "symfony/security-bundle": "^3.1 || ^4.0",
- "symfony/yaml": "^3.1 || ^4.0"
+ "symfony/asset": "^3.1 || ^4.0 || ^5.0",
+ "symfony/browser-kit": "^3.1 || ^4.0 || ^5.0",
+ "symfony/console": "^3.1 || ^4.0 || ^5.0",
+ "symfony/css-selector": "^3.1 || ^4.0 || ^5.0",
+ "symfony/phpunit-bridge": "^3.1 || ^4.0 || ^5.0",
+ "symfony/process": "^3.1 || ^4.0 || ^5.0",
+ "symfony/security-bundle": "^3.1 || ^4.0 || ^5.0",
+ "symfony/yaml": "^3.1 || ^4.0 || ^5.0"
  },
  "extra": {
  "branch-alias": {

src/Command/CompileCommand.php

@@ -41,5 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  }
  $io->table(['class', 'path'], $rows);
  }
+
+ return 0;
  }
 }

src/Command/DebugCommand.php

@@ -77,6 +77,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $resolver = $this->{$category.'Resolver'};
  $this->renderTable($resolver, $tableHeaders, $io);
  }
+
+ return 0;
  }
 
  /**

src/Command/GraphQLDumpSchemaCommand.php

@@ -68,14 +68,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $io = new SymfonyStyle($input, $output);
  $file = $this->createFile($input);
  $io->success(\sprintf('GraphQL schema "%s" was successfully dumped.', \realpath($file)));
+
+ return 0;
  }
 
  private function createFile(InputInterface $input)
  {
  $format = \strtolower($input->getOption('format'));
  $schemaName = $input->getOption('schema');
 
- $file = $input->getOption('file') ?: $this->baseExportPath.\sprintf('/../var/schema%s.%s', $schemaName ? '.'.$schemaName : '', $format);
+ $file = $input->getOption('file') ?: $this->baseExportPath.\sprintf('/var/schema%s.%s', $schemaName ? '.'.$schemaName : '', $format);
 
  switch ($format) {
  case 'json':

src/Resources/config/services.yml

@@ -138,7 +138,7 @@ services:
  class: Overblog\GraphQLBundle\Command\GraphQLDumpSchemaCommand
  public: true
  arguments:
- - "%kernel.root_dir%"
+ - "%kernel.cache_dir%/../.."
  calls:
  # "overblog_graphql.request_executor" service must be load lazy since that command service
  # is instanced before ClassLoaderEvent. This issues is fix in Symfony 3.4 introducing lazy commands

tests/Config/Parser/GraphQLParserTest.php

@@ -5,7 +5,7 @@
 use Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode;
 use Overblog\GraphQLBundle\Config\Parser\GraphQLParser;
 use Overblog\GraphQLBundle\Tests\VersionHelper;
-use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 

tests/Functional/App/TestKernel.php

@@ -42,6 +42,11 @@ public function getLogDir()
  return $this->basePath().'logs';
  }
 
+ public function getProjectDir()
+ {
+ return __DIR__;
+ }
+
  public function getRootDir()
  {
  return __DIR__;
@@ -83,4 +88,15 @@ private function basePath()
  {
  return \sys_get_temp_dir().'/OverblogGraphQLBundle/'.Kernel::VERSION.'/'.($this->testCase ? $this->testCase.'/' : '');
  }
+
+ protected function build(ContainerBuilder $container)
+ {
+ if (!$container->hasParameter('kernel.root_dir')) {
+ $container->setParameter('kernel.root_dir', $this->getRootDir());
+ }
+
+ if (!$container->hasParameter('kernel.project_dir')) {
+ $container->setParameter('kernel.project_dir', $this->getProjectDir());
+ }
+ }
 }

tests/Functional/Controller/GraphControllerTest.php

@@ -85,6 +85,7 @@ public function graphQLEndpointUriProvider()
  public function testEndpointWithEmptyQuery()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/', []);
  $client->getResponse()->getContent();
  }
@@ -96,6 +97,7 @@ public function testEndpointWithEmptyQuery()
  public function testEndpointWithEmptyJsonBodyQuery()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/', [], [], ['CONTENT_TYPE' => 'application/json']);
  $client->getResponse()->getContent();
  }
@@ -107,6 +109,7 @@ public function testEndpointWithEmptyJsonBodyQuery()
  public function testEndpointWithInvalidBodyQuery()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/', [], [], ['CONTENT_TYPE' => 'application/json'], '{');
  $client->getResponse()->getContent();
  }
@@ -143,6 +146,7 @@ public function testEndpointActionWithVariables()
  public function testEndpointActionWithInvalidVariables()
  {
  $client = static::createClient(['test_case' => 'connection']);
+ $this->disableCatchExceptions($client);
 
  $query = <<<'EOF'
 query {
@@ -160,6 +164,7 @@ public function testEndpointActionWithInvalidVariables()
  public function testMultipleEndpointActionWithUnknownSchemaName()
  {
  $client = static::createClient(['test_case' => 'connection']);
+ $this->disableCatchExceptions($client);
 
  $query = <<<'EOF'
 query {
@@ -225,6 +230,7 @@ public function graphQLBatchEndpointUriProvider()
  public function testBatchEndpointWithEmptyQuery()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/batch', [], [], ['CONTENT_TYPE' => 'application/json'], '{}');
  $client->getResponse()->getContent();
  }
@@ -236,6 +242,7 @@ public function testBatchEndpointWithEmptyQuery()
  public function testBatchEndpointWrongContentType()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/batch');
  $client->getResponse()->getContent();
  }
@@ -247,6 +254,7 @@ public function testBatchEndpointWrongContentType()
  public function testBatchEndpointWithInvalidJson()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/batch', [], [], ['CONTENT_TYPE' => 'application/json'], '{');
  $client->getResponse()->getContent();
  }
@@ -258,6 +266,7 @@ public function testBatchEndpointWithInvalidJson()
  public function testBatchEndpointWithInvalidQuery()
  {
  $client = static::createClient();
+ $this->disableCatchExceptions($client);
  $client->request('GET', '/batch', [], [], ['CONTENT_TYPE' => 'application/json'], '{"test" : {"query": 1}}');
  $client->getResponse()->getContent();
  }

tests/Functional/ForwardCompatTestCaseTrait.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+// see https://github.com/lexik/LexikJWTAuthenticationBundle/blob/master/Tests/Functional/ForwardCompatTestCaseTrait.php
+
+if (70000 <= \PHP_VERSION_ID && (new \ReflectionMethod(WebTestCase::class, 'tearDown'))->hasReturnType()) {
+ eval('
+ namespace Overblog\GraphQLBundle\Tests\Functional;
+
+ /**
+ * @internal
+ */
+ trait ForwardCompatTestCaseTrait
+ {
+ protected function tearDown(): void
+ {
+ static::ensureKernelShutdown();
+ static::$kernel = null;
+ }
+ }
+ ');
+} else {
+ /**
+ * @internal
+ */
+ trait ForwardCompatTestCaseTrait
+ {
+ protected function tearDown()
+ {
+ static::ensureKernelShutdown();
+ static::$kernel = null;
+ }
+ }
+}