test

.php_cs.dist

@@ -43,7 +43,6 @@ return PhpCsFixer\Config::create()
             'throw',
             'use',
         ],
-        'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,

.travis.yml

@@ -7,13 +7,22 @@ cache:
     - $HOME/.composer/cache
     - $HOME/.npm
 
+env:
+  global:
+    - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
+
 matrix:
   include:
     - php: '7.0'
     - php: '7.1'
+    - php: '7.2'
       env: coverage=1 lint=1
-    - php: '7.1'
+    - php: '7.2'
       env: deps='low'
+    - php: '7.2'
+      env: SYMFONY_DEPRECATIONS_HELPER=0
+  allow_failures:
+      env: SYMFONY_DEPRECATIONS_HELPER=0
 
 before_install:
   - phpenv config-rm xdebug.ini || echo "xdebug not available"
@@ -23,11 +32,11 @@ before_install:
   - if [[ $coverage = 1 ]]; then mkdir -p build/logs build/cov; fi
   - if [[ $coverage = 1 ]]; then wget https://phar.phpunit.de/phpcov.phar; fi
   - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.7.1/php-cs-fixer.phar; fi
   - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.8'; fi
 
 install:
-  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^4.0.1'; fi
+  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^5.2.2'; fi
   - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi
   - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
 

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 2.2.0
+
+* Add GraphQL support
+* Add JSONAPI support
+* Add a new `@ApiFilter` annotation to directly configure filters from resource classes
+* Add a partial paginator that prevents `COUNT()` SQL queries
+* Add an option to serialize Validator's payloads (e.g. error levels)
+* Add support for generators in data providers
+* Add a new `allow_plain_identifiers` option to allow using plain IDs as identifier instead of IRIs
+* Add support for resource names without namespace
+* Automatically enable FOSUser support if the bundle is installed
+* Add an `AbstractCollectionNormalizer` to help supporting custom formats
+* Deprecate NelmioApiDocBundle 2 support (upgrade to v3, it has native API Platform support)
+
+## 2.1.2
+
+* PHP 7.2 compatibility
+* Symfony 4 compatibility
+* Fix the Swagger UI documentation for specific routes (the API request wasn't executed automatically anymore)
+* Add a missing cache tag on empty collections
+* Fix a missing service when no Varnish URL is defined
+* Fix the whitelist comparison in the property filer
+* Fix some bugs regarding subresources in the Swagger and Hydra normalizers
+* Make route requirements configurable
+* Make possible to configure the Swagger context for properties
+* Better exception messages when there is a content negotiation error
+* Use the `PriorityTaggedServiceTrait` provided by Symfony instead of a custom implementation
+* Test upstream libs deprecations
+* Various quality fixes and tests cleanup
+
 ## 2.1.1
 
 * Fix path generators

README.md

@@ -9,8 +9,6 @@ It natively supports popular open formats including [JSON for Linked Data (JSON-
 Build a working and fully-featured CRUD API in minutes. Leverage the awesome features of the tool to develop complex and
 high performance API-first projects. Extend or override everything you want.
 
-[![JSON-LD enabled](http://json-ld.org/images/json-ld-button-88.png)](http://json-ld.org)
-[![Join the chat at https://gitter.im/api-platform/api-platform](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/api-platform/api-platform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/api-platform/core.svg?branch=master)](https://travis-ci.org/api-platform/core)
 [![Build status](https://ci.appveyor.com/api/projects/status/grwuyprts3wdqx5l?svg=true)](https://ci.appveyor.com/project/dunglas/dunglasapibundle)
 [![Coverage Status](https://coveralls.io/repos/github/api-platform/core/badge.svg)](https://coveralls.io/github/api-platform/core)

behat.yml.dist

@@ -3,9 +3,11 @@ default:
     default:
       contexts:
         - 'FeatureContext': { doctrine: '@doctrine' }
+        - 'GraphqlContext'
         - 'HydraContext'
         - 'SwaggerContext'
         - 'HttpCacheContext'
+        - 'JsonApiContext': { doctrine: '@doctrine', jsonApiSchemaFile: 'tests/Fixtures/JsonSchema/jsonapi.json' }
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
         - 'Behatch\Context\JsonContext'
@@ -28,9 +30,11 @@ coverage:
     default:
       contexts:
         - 'FeatureContext': { doctrine: '@doctrine' }
+        - 'GraphqlContext'
         - 'HydraContext'
         - 'SwaggerContext'
         - 'HttpCacheContext'
+        - 'JsonApiContext': { doctrine: '@doctrine', jsonApiSchemaFile: 'tests/Fixtures/JsonSchema/jsonapi.json' }
         - 'CoverageContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'

composer.json

@@ -37,11 +37,12 @@
         "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0",
+        "justinrainbow/json-schema": "^1.5",
         "nelmio/api-doc-bundle": "^2.11.2",
-        "php-mock/php-mock-phpunit": "^1.1",
-        "phpdocumentor/reflection-docblock": "^3.0",
-        "phpdocumentor/type-resolver": "^0.2",
-        "phpunit/phpunit": "^5.6.8",
+        "php-mock/php-mock-phpunit": "^2.0",
+        "phpdocumentor/reflection-docblock": "^3.0 || ^4.0",
+        "phpdocumentor/type-resolver": "^0.2.1 || ^0.3 || 0.4",
+        "phpunit/phpunit": "^6.1",
         "psr/log": "^1.0",
         "sensio/framework-extra-bundle": "^3.0.11 || ^4.0",
         "symfony/asset": "^3.3 || ^4.0",
@@ -50,7 +51,7 @@
         "symfony/console": "^3.3 || ^4.0",
         "symfony/debug": "^2.8 || ^3.0 || ^4.0",
         "symfony/dependency-injection": "^3.3 || ^4.0",
-        "symfony/doctrine-bridge": "^2.8 || ^3.0 || ^4.0",
+        "symfony/doctrine-bridge": "^2.8.12 || ^3.0 || ^4.0",
         "symfony/event-dispatcher": "^3.3 || ^4.0",
         "symfony/expression-language": "^2.8 || ^3.0 || ^4.0",
         "symfony/finder": "^3.3 || ^4.0",
@@ -62,7 +63,8 @@
         "symfony/security-bundle": "^3.0 || ^4.0",
         "symfony/twig-bundle": "^3.1 || ^4.0",
         "symfony/validator": "^3.3 || ^4.0",
-        "symfony/yaml": "^3.3 || ^4.0"
+        "symfony/yaml": "^3.3 || ^4.0",
+        "webonyx/graphql-php": "^0.10.2"
     },
     "conflict": {
         "symfony/dependency-injection": "<3.3"
@@ -76,7 +78,8 @@
         "symfony/expression-language": "To use authorization features.",
         "symfony/config": "To load XML configuration files.",
         "symfony/security": "To use authorization features.",
-        "symfony/twig-bundle": "To use the Swagger UI integration."
+        "symfony/twig-bundle": "To use the Swagger UI integration.",
+        "webonyx/graphql-php": "To support GraphQL."
     },
     "autoload": {
         "psr-4": { "ApiPlatform\\Core\\": "src/" }
@@ -86,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     }
 }

features/bootstrap/CoverageContext.php

@@ -24,7 +24,7 @@
  * @author Kévin Dunglas <[email protected]>
  * @copyright Adapted from https://gist.github.com/eliecharra/9c8b3ba57998b50e14a6
  */
-class CoverageContext implements Context
+final class CoverageContext implements Context
 {
     /**
      * @var CodeCoverage