Merge branch '2.0'

Author: dunglas

.php_cs.dist

@@ -6,11 +6,43 @@ $finder = PhpCsFixer\Finder::create()
 ;
 
 return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
+        'braces' => [
+            'allow_single_line_closure' => true,
+        ],
+        'declare_strict_types' => true,
+        'modernize_types_casting' => true,
+        // 'native_function_invocation' => true,
+        'no_extra_consecutive_blank_lines' => [
+            'break',
+            'continue',
+            'curly_brace_block',
+            'extra',
+            'parenthesis_brace_block',
+            'return',
+            'square_brace_block',
+            'throw',
+            'use',
+        ],
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
         'ordered_imports' => true,
+        // 'phpdoc_add_missing_param_annotation' => [
+        //     'only_untyped' => false,
+        // ],
         'phpdoc_order' => true,
-        'array_syntax' => array('syntax' => 'short'),
+        'psr4' => true,
+        'semicolon_after_instruction' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'ternary_to_null_coalescing' => true,
     ])
     ->setFinder($finder)
 ;

.travis.yml

@@ -22,7 +22,7 @@ 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.0.0/php-cs-fixer.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.1.2/php-cs-fixer.phar; fi
   - export PATH="$PATH:$HOME/.composer/vendor/bin"
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
@@ -32,11 +32,11 @@ install:
   - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
 
 script:
-  - if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit; fi
-  - if [[ $coverage = 1 ]]; then for feature in $(ls -d features/*/ | cut -f2 -d'/' | grep -v bootstrap); do FEATURE=$feature phpdbg -qrr vendor/bin/behat --profile coverage features/$feature; done; else vendor/bin/behat; fi
+  - if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --colors=never --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit --colors=never; fi
+  - if [[ $coverage = 1 ]]; then for feature in $(ls -d features/*/ | cut -f2 -d'/' | grep -v bootstrap); do FEATURE=$feature phpdbg -qrr vendor/bin/behat --profile coverage features/$feature --no-colors; done; else vendor/bin/behat --no-colors; fi
   - if [[ $coverage = 1 ]]; then phpdbg -qrr phpcov.phar merge --clover build/logs/clover.xml build/cov; fi
   - tests/Fixtures/app/console api:swagger:export > swagger.json && swagger validate swagger.json && rm swagger.json
-  - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff; fi
+  - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
 
 after_success:
   - if [[ $coverage = 1 ]]; then travis_retry php coveralls.phar; fi

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.7
+
+* [security] Hide error's message in prod mode when a 500 error occurs (Api Problem format)
+* Fix sorting when eager loading is used
+* Allow eager loading when using composite identifiers
+* Don't use automatic eager loading when disabled in the config
+* Use `declare(strict_types=1)` and improve coding standards
+* Automatically refresh routes in dev mode when a resource is created or deleted
+
 ## 2.0.6
 
 * Correct the XML Schema type generated for floats in the Hydra documentation

behat.yml renamed to behat.yml.dist

@@ -20,7 +20,7 @@ default:
       sessions:
         default:
           symfony2: ~
-    'Sanpi\Behatch\Extension': ~
+    'Behatch\Extension': ~
 
 coverage:
   suites:

composer.json

@@ -19,6 +19,7 @@
         "psr/cache": "^1.0",
         "symfony/http-foundation": "^2.7 || ^3.0",
         "symfony/http-kernel": "^2.7 || ^3.0",
+        "symfony/property-access": "^2.7 || ^3.0",
         "symfony/property-info": "^3.1",
         "symfony/serializer": "^3.1",
         "willdurand/negotiation": "^2.0.3"
@@ -33,7 +34,7 @@
         "doctrine/doctrine-bundle": "^1.6.3",
         "doctrine/orm": "^2.5",
         "doctrine/annotations": "^1.2",
-        "friendsofsymfony/user-bundle": "^2.0@dev",
+        "friendsofsymfony/user-bundle": "^2.0",
         "nelmio/api-doc-bundle": "^2.11.2",
         "php-mock/php-mock-phpunit": "^1.1",
         "phpdocumentor/reflection-docblock": "^3.0",
@@ -47,13 +48,12 @@
         "symfony/dependency-injection": "^2.7 || ^3.0",
         "symfony/doctrine-bridge": "^2.8 || ^3.0",
         "symfony/expression-language": "^2.8 || ^3.0",
-        "symfony/phpunit-bridge": "^2.7 || ^3.0",
-        "symfony/security": "^2.7 || ^3.0",
-        "symfony/templating": "^2.7 || ^3.0",
-        "symfony/validator": "^2.7 || ^3.0",
         "symfony/finder": "^2.7 || ^3.0",
         "symfony/framework-bundle": "^3.1",
-        "symfony/twig-bundle": "^2.8 || ^3.1"
+        "symfony/phpunit-bridge": "^2.7 || ^3.0",
+        "symfony/security": "^2.7 || ^3.0",
+        "symfony/twig-bundle": "^2.8 || ^3.1",
+        "symfony/validator": "^2.7 || ^3.0"
     },
     "suggest": {
         "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.",

features/bootstrap/CoverageContext.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use SebastianBergmann\CodeCoverage\CodeCoverage;

features/bootstrap/FeatureContext.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeItem;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeLabel;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation;

features/bootstrap/HydraContext.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\Environment\InitializedContextEnvironment;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -235,7 +237,7 @@ private function getOperations($className)
     {
         $classInfos = $this->getClassInfos($className);
 
-        return isset($classInfos->{'hydra:supportedOperation'}) ? $classInfos->{'hydra:supportedOperation'} : [];
+        return $classInfos->{'hydra:supportedOperation'} ?? [];
     }
 
     /**
@@ -251,7 +253,7 @@ private function getProperties($className)
     {
         $classInfos = $this->getClassInfos($className);
 
-        return isset($classInfos->{'hydra:supportedProperty'}) ? $classInfos->{'hydra:supportedProperty'} : [];
+        return $classInfos->{'hydra:supportedProperty'} ?? [];
     }
 
     /**

features/bootstrap/SwaggerContext.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\Environment\InitializedContextEnvironment;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -132,7 +134,7 @@ public function assertPropertyExist($propertyName, $className)
     public function assertPropertyIsRequired(string $propertyName, string $className)
     {
         $classInfo = $this->getClassInfos($className);
-        if (!in_array($propertyName, $classInfo->required)) {
+        if (!in_array($propertyName, $classInfo->required, true)) {
             throw new \Exception(sprintf('Property "%s" of class "%s" should be required', $propertyName, $className));
         }
     }

features/hal/problem.feature

@@ -3,6 +3,7 @@ Feature: Error handling valid according to RFC 7807 (application/problem+json)
   As a client software developer
   I need to retrieve an RFC 7807 compliant serialization of errors
 
+  @createSchema
   Scenario: Get an error
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
@@ -28,6 +29,7 @@ Feature: Error handling valid according to RFC 7807 (application/problem+json)
     }
     """
 
+  @dropSchema
   Scenario: Get an error during deserialization of simple relation
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"

phpunit.xml.dist

@@ -5,8 +5,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
          backupGlobals="false"
          bootstrap="tests/Fixtures/app/bootstrap.php"
-         colors="true">
+         colors="true"
+>
     <php>
+        <ini name="error_reporting" value="-1" />
+        <ini name="memory_limit" value="-1" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
     </php>
 

src/Action/EntrypointAction.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Action;
 
 use ApiPlatform\Core\Api\Entrypoint;

src/Action/ExceptionAction.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Action;
 
 use ApiPlatform\Core\Util\ErrorFormatGuesser;

src/Action/PlaceholderAction.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Action;
 
 /**

src/Annotation/ApiProperty.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Annotation;
 
 /**

src/Annotation/ApiResource.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Annotation;
 
 /**

src/Api/Entrypoint.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection;

src/Api/FilterCollection.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 /**

src/Api/FilterInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 /**

src/Api/IriConverterInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;

src/Api/OperationMethodResolverInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Exception\RuntimeException;

src/Api/ResourceClassResolver.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\DataProvider\PaginatorInterface;

src/Api/ResourceClassResolverInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;

src/Api/UrlGeneratorInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 /**

src/Bridge/Doctrine/EventListener/WriteListener.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Bridge\Doctrine\EventListener;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
@@ -58,7 +60,6 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
             case Request::METHOD_POST:
                 $objectManager->persist($controllerResult);
                 break;
-
             case Request::METHOD_DELETE:
                 $objectManager->remove($controllerResult);
                 $event->setControllerResult(null);

src/Bridge/Doctrine/Orm/CollectionDataProvider.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;