Merge branch 'master' into mo-olsavmic-patch-1

Author: Vincz

.php_cs.dist

@@ -10,17 +10,13 @@ return PhpCsFixer\Config::create()
     ->setRules(
         [
             '@Symfony' => true,
-            '@PHP71Migration' => true,
-            '@PHP71Migration:risky' => true,
-            'single_blank_line_before_namespace' => true,
-            'ordered_imports' => true,
-            'concat_space' => ['spacing' => 'none'],
-            'phpdoc_no_alias_tag' => ['type' => 'var'],
-            'no_mixed_echo_print' => ['use' => 'echo'],
-            'binary_operator_spaces' => ['align_double_arrow' => false, 'align_equals' => false],
+            'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
             'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
-            'native_function_invocation' => true,
             'fully_qualified_strict_types' => true,
+            'single_line_throw' => false,
+            'phpdoc_to_comment' => false,
+            'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+            'global_namespace_import' => ['import_functions' => true, 'import_classes' => true, 'import_constants' => true],
         ]
     )
     ->setFinder($finder)

.travis.yml

@@ -22,7 +22,6 @@ before_install:
     - if [ "${SYMFONY_VERSION}" != "" ]; then perl -pi -e 's#"(symfony/.*)":\s*".*"#"$1":"'"${SYMFONY_VERSION}"'"#' composer.json; fi;
     - if [ "${PHPUNIT_VERSION}" != "" ]; then  composer req "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update; fi;
     - if [ "${VALIDATOR}" = "0" ]; then  composer remove "symfony/validator" --dev --no-update; fi;
-    - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
     - composer selfupdate
     - if [ $GRAPHQLPHP_VERSION ]; then composer require "webonyx/graphql-php:${GRAPHQLPHP_VERSION}" --dev --no-update; fi;
 
@@ -32,45 +31,41 @@ script: composer test
 
 jobs:
     include:
-        - php: 7.2
-          env: SYMFONY_VERSION=4.3.* PHPUNIT_VERSION=^7.2
-        - php: 7.3
-          env: SYMFONY_VERSION=4.3.* VALIDATOR=0
-        - php: 7.3
-          env: SYMFONY_VERSION=4.3.* USE_EXPERIMENTAL_EXECUTOR=1
-        - 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: 7.4snapshot
-          env: SYMFONY_VERSION=4.3.*
+        - php: 7.4
+          env: SYMFONY_VERSION=4.4.*
+
+        - php: 7.4
+          env: SYMFONY_VERSION=5.0.*
+
+        - php: 7.4
+          env: SYMFONY_VERSION=5.1.*
+
         - php: nightly
           env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
 
         - stage: Code Quality
-          php: 7.2
+          php: 7.4
           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
-          script: bin/phpunit --color=always -v --debug -d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml
+              - pecl install pcov
+          script: php -dpcov.enabled=1 bin/phpunit --color=always -v --debug --coverage-clover=build/logs/clover.xml
           after_script:
-            - wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
-            - composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v
+              - wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+              - composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v
 
         - stage: Code Quality
-          php: 7.2
-          env: STATIC_ANALYSIS SYMFONY_VERSION=4.3.*
+          php: 7.4
+          env: STATIC_ANALYSIS SYMFONY_VERSION=4.4.*
           install: travis_retry composer install --prefer-dist
           script: composer static-analysis
 
         - stage: Code Quality
-          php: 7.2
+          php: 7.4
           env: CODING_STANDARDS
           script: composer check-cs
 
         - stage: Code Quality
-          php: 7.2
+          php: 7.4
           env: BENCHMARK
           script: composer bench
 

Dockerfile

@@ -5,36 +5,38 @@ COPY composer.json /
 FROM scratch AS test_source
 
 COPY benchmarks/ benchmarks/
-COPY lib/ /lib/
 COPY src/ /src/
 COPY tests/ /tests/
 COPY phpunit.xml.* phpstan.neon.* .php_cs.* phpbench.json /
 
 FROM alpine:3.9
 
+ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
+
+RUN apk --update add ca-certificates && \
+    echo "https://dl.bintray.com/php-alpine/v3.9/php-7.4" >> /etc/apk/repositories
+
 # alpine php package does not include default extensions, be explicit
 RUN set -eu; \
     apk add --no-cache \
-        php7 \
-        php7-iconv \
-        php7-json \
-        php7-mbstring \
-        php7-openssl \
-        php7-phar \
-        php7-tokenizer \
-        php7-xml \
-        php7-xmlwriter \
-        php7-dom \
-        php7-pdo \
-    ;
+        php \
+        php-iconv \
+        php-json \
+        php-mbstring \
+        php-openssl \
+        php-phar \
+        php-xml \
+        php-dom \
+        php-pdo \
+    ; ln -s /usr/bin/php7 /usr/bin/php
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
 WORKDIR /opt/test
 
 COPY --from=composer_install_requirements / .
 
-RUN composer install
+RUN php7 /usr/bin/composer install
 
 COPY --from=test_source / .
 

README.md

@@ -1,10 +1,10 @@
 OverblogGraphQLBundle
 ======================
 
-[![Build Status](https://travis-ci.org/overblog/GraphQLBundle.svg?branch=master)](https://travis-ci.org/overblog/GraphQLBundle)
-[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/master?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=master)
-[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=master)](https://coveralls.io/github/overblog/GraphQLBundle?branch=master)
+[![Build Status](https://travis-ci.org/overblog/GraphQLBundle.svg?branch=0.13)](https://travis-ci.org/overblog/GraphQLBundle)
+[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/0.13?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/0.13)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=0.13)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=0.13)
+[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=0.13)](https://coveralls.io/github/overblog/GraphQLBundle?branch=0.13)
 [![Latest Stable Version](https://poser.pugx.org/overblog/graphql-bundle/version)](https://packagist.org/packages/overblog/graphql-bundle)
 [![Latest Unstable Version](https://poser.pugx.org/overblog/graphql-bundle/v/unstable)](https://packagist.org/packages/overblog/graphql-bundle)
 [![Total Downloads](https://poser.pugx.org/overblog/graphql-bundle/downloads)](https://packagist.org/packages/overblog/graphql-bundle)
@@ -18,12 +18,13 @@ It also supports:
 
 Browse your version documentation:
 
-* [0.8  (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.8/README.md)
-* [0.9  (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.9/README.md)
-* [0.10 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.10/README.md)
-* [0.11 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.11/README.md)
+* [1.0 (DEV)](https://github.com/overblog/GraphQLBundle/blob/master/README.md)
+* [0.13 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.13/README.md)
 * [0.12 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.12/README.md)
-* [0.13 (DEV)](https://github.com/overblog/GraphQLBundle/blob/master/README.md)
+* [0.11 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.11/README.md)
+* [0.10 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.10/README.md)
+* [0.9  (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.9/README.md)
+* [0.8  (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.8/README.md)
 
 [Versions requirements](docs/index.md#versions-requirements)
 
@@ -88,6 +89,7 @@ Documentation
   - [Disable introspection](docs/security/disable_introspection.md)
 - [Errors handling](docs/error-handling/index.md)
 - [Events](docs/events/index.md)
+- [Profiler](docs/profiler/index.md)
 
 Talks and slides to help you start
 ----------------------------------
@@ -109,8 +111,9 @@ Talks and slides to help you start
 Community
 ---------
 
-* Get some support on [Symfony devs Slack](https://symfony.com/slack-invite)
+* Get support on [Symfony devs Slack](https://symfony.com/slack-invite)
   on the dedicated channel **overblog-graphql**.
+* Get support in Telegram group [Overblog GraphQL](https://t.me/overblog_graphql)
 * Follow us on [GitHub](https://github.com/overblog)
 
 Contributing

UPGRADE-1.0.md

@@ -0,0 +1,87 @@
+UPGRADE FROM 0.13 to 1.0
+=======================
+
+# Table of Contents
+
+- [Customize the cursor encoder of the edges of a connection](#customize-the-cursor-encoder-of-the-edges-of-a-connection)
+- [Change arguments of `TypeGenerator`](#change-arguments-of-typegenerator)
+- [Add magic `__get` method to `ArgumentInterface` implementors](#add-magic-__get-method-to-argumentinterface-implementors)
+
+### Customize the cursor encoder of the edges of a connection
+
+The connection builder now accepts an optional custom cursor encoder as first argument of the constructor.
+
+```diff
+$connectionBuilder = new ConnectionBuilder(
++   new class implements CursorEncoderInterface {
++       public function encode($value): string
++       {
++           ...
++       }
++
++       public function decode(string $cursor)
++       {
++           ...
++       }
++   }
+    static function (iterable $edges, PageInfoInterface $pageInfo) {
+        ...
+    },
+    static function (string $cursor, $value, int $index) {
+        ...
+    }
+);
+```
+
+### Change arguments of `TypeGenerator` class
+
+The `Overblog\GraphQLBundle\Generator\TypeGenerator` service is used internally for GraphQL types compilation. If you 
+overridden the service definition, please take into account the new constructor signature:
+
+```diff
+public function __construct(
+    string $classNamespace,
+-   array $skeletonDirs,
+    ?string $cacheDir,
+    array $configs,
++   TypeBuilder $typeBuilder
+    bool $useClassMap = true,
+-   callable $configProcessor = null,
+    ?string $baseCacheDir = null,
+    ?int $cacheDirMask = null
+) {
+```
+`TypeBuilder` here is a new service `Overblog\GraphQLBundle\Generator\TypeBuilder`, which is also used internally.
+
+### Add magic `__get` method to `ArgumentInterface` implementors
+
+The interface `Overblog\GraphQLBundle\Definition\ArgumentInterface` as well as implementing it class 
+`Overblog\GraphQLBundle\Definition\Argument` now have the magic `__get` method:
+
+```diff
+interface ArgumentInterface extends ArrayAccess, Countable
+{
+    /**
+     * @return array the old array
+     */
+    public function exchangeArray(array $array): array;
+
+    public function getArrayCopy(): array;
+
++   /**
++    * @return mixed
++    */
++   public function __get(string $name);
+}
+
+class Argument implements ArgumentInterface
+{
+    // ...
+
++   public function __get(string $name)
++   {
++       return $this->rawArguments[$name] ?? null;
++   }
+}
+```
+If you use your own class for resolver arguments, then it should have a `__get` method as well.

composer.json

@@ -12,35 +12,32 @@
     ],
     "autoload": {
         "psr-4": {
-            "Overblog\\GraphQLBundle\\": "src/",
-            "Overblog\\GraphQLGenerator\\": "lib/generator/src/"
+            "Overblog\\GraphQLBundle\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Overblog\\GraphQLBundle\\Benchmarks\\": "benchmarks/",
-            "Overblog\\GraphQLBundle\\Tests\\": "tests/",
-            "Overblog\\GraphQLGenerator\\Tests\\": "lib/generator/tests/"
+            "Overblog\\GraphQLBundle\\Tests\\": "tests/"
         }
     },
     "config": {
         "bin-dir": "bin",
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "ext-json": "*",
+        "murtukov/php-code-generator": "^0.1.4",
         "psr/log": "^1.0",
-        "symfony/config": "^4.3 || ^5.0",
-        "symfony/dependency-injection": "^4.3 || ^5.0",
-        "symfony/event-dispatcher": "^4.3 || ^5.0",
-        "symfony/expression-language": "^4.3 || ^5.0",
-        "symfony/framework-bundle": "^4.3 || ^5.0",
-        "symfony/options-resolver": "^4.3 || ^5.0",
-        "webonyx/graphql-php": "^0.13.5"
-    },
-    "replace": {
-        "overblog/graphql-php-generator": "self.version"
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.0",
+        "symfony/expression-language": "^4.4 || ^5.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0",
+        "symfony/options-resolver": "^4.4 || ^5.0",
+        "symfony/property-access": "^4.4 || ^5.0",
+        "webonyx/graphql-php": "^14.0.1"
     },
     "suggest": {
         "nelmio/cors-bundle": "For more flexibility when using CORS prefight",
@@ -51,20 +48,22 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan-shim": "^0.11.19",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpstan/phpstan-symfony": "^0.11",
-        "phpunit/phpunit": "<8.3",
+        "phpstan/phpstan": "^0.12.32",
+        "phpstan/phpstan-phpunit": "^0.12.11",
+        "phpstan/phpstan-symfony": "^0.12.6",
+        "phpunit/phpunit": "^9.2",
         "react/promise": "^2.5",
-        "symfony/asset": "^4.3 || ^5.0",
-        "symfony/browser-kit": "^4.3 || ^5.0",
-        "symfony/console": "^4.3 || ^5.0",
-        "symfony/css-selector": "^4.3 || ^5.0",
-        "symfony/phpunit-bridge": "^4.3 || ^5.0",
-        "symfony/process": "^4.3 || ^5.0",
-        "symfony/security-bundle": "^4.3 || ^5.0",
-        "symfony/validator": "^4.3 || ^5.0",
-        "symfony/yaml": "^4.3 || ^5.0"
+        "symfony/asset": "^4.4 || ^5.0",
+        "symfony/browser-kit": "^4.4 || ^5.0",
+        "symfony/console": "^4.4 || ^5.0",
+        "symfony/css-selector": "^4.4 || ^5.0",
+        "symfony/phpunit-bridge": "^4.4 || ^5.0",
+        "symfony/process": "^4.4 || ^5.0",
+        "symfony/security-bundle": "^4.4 || ^5.0",
+        "symfony/validator": "^4.4 || ^5.0",
+        "symfony/var-dumper": "^4.4 || ^5.0",
+        "symfony/yaml": "^4.4 || ^5.0",
+        "twig/twig": "^2.10|^3.0"
     },
     "extra": {
         "branch-alias": {
@@ -80,16 +79,14 @@
             "test -f phpbench.phar || wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey",
             "@php phpbench.phar run -l dots --ansi -vvv --report='generator: \"table\", cols: [\"benchmark\", \"subject\", \"params\", \"best\", \"mean\", \"mode\", \"worst\", \"diff\"], break: [\"benchmark\"], sort: {mean: \"asc\"}'"
         ],
-        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.15.3/php-cs-fixer.phar -O php-cs-fixer.phar",
+        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -O php-cs-fixer.phar",
         "fix-cs": [
             "@install-cs",
-            "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi",
-            "@php php-cs-fixer.phar fix --config=lib/generator/.php_cs.dist --diff -v --allow-risky=yes --ansi"
+            "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"
         ],
         "check-cs": [
             "@install-cs",
-            "@php php-cs-fixer.phar fix --dry-run --diff -v --allow-risky=yes --ansi",
-            "@php php-cs-fixer.phar fix --config=lib/generator/.php_cs.dist --dry-run --diff -v --allow-risky=yes --ansi"
+            "@php php-cs-fixer.phar fix --dry-run --diff -v --allow-risky=yes --ansi"
         ],
         "code-quality": [
             "rm composer.lock",