Merge branch '2.2'

Author: dunglas

core/errors.md

@@ -15,9 +15,9 @@ configure API Platform to convert it to a `404 Not Found` error:
 
 ```php
 <?php
-// src/AppBundle/Exception/ProductNotFoundException.php
+// src/Exception/ProductNotFoundException.php
 
-namespace AppBundle\Exception;
+namespace App\Exception;
 
 final class ProductNotFoundException extends \Exception
 {
@@ -26,13 +26,13 @@ final class ProductNotFoundException extends \Exception
 
 ```php
 <?php
-// src/AppBundle/EventSubscriber/CartManager.php
+// src/EventSubscriber/CartManager.php
 
-namespace AppBundle\EventSubscriber;
+namespace App\EventSubscriber;
 
 use ApiPlatform\Core\EventListener\EventPriorities;
-use AppBundle\Entity\Product;
-use AppBundle\Exception\ProductNotFoundException;
+use App\Entity\Product;
+use App\Exception\ProductNotFoundException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
@@ -43,7 +43,7 @@ final class ProductManager implements EventSubscriberInterface
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::REQUEST => ['checkProductAvailability', EventPriorities::POST_DESERIALIZE],
+            KernelEvents::VIEW => ['checkProductAvailability', EventPriorities::PRE_VALIDATE],
         ];
     }
 
@@ -65,7 +65,7 @@ final class ProductManager implements EventSubscriberInterface
 If you use the standard distribution of API Platform, this event listener will be automatically registered. If you use a
 custom installation, [learn how to register listeners](events.md).
 
-Then, configure the framework to catch `AppBundle\Exception\ProductNotFoundException` exceptions and convert them in `404`
+Then, configure the framework to catch `App\Exception\ProductNotFoundException` exceptions and convert them in `404`
 errors:
 
 ```yaml
@@ -77,7 +77,7 @@ api_platform:
         Symfony\Component\Serializer\Exception\ExceptionInterface: 400 # Use a raw status code (recommended)
         ApiPlatform\Core\Exception\InvalidArgumentException: 'HTTP_BAD_REQUEST' # Or a `Symfony\Component\HttpFoundation\Response`'s constant
 
-        AppBundle\Exception\ProductNotFoundException: 404 # Here is the handler for our custom exception
+        App\Exception\ProductNotFoundException: 404 # Here is the handler for our custom exception
 ```
 
 Any type of `Exception` can be thrown, API Platform will convert it to a Symfony's `HttpException`. The framework also takes

core/events.md

@@ -101,8 +101,8 @@ Constant           | Event             | Priority |
 `POST_VALIDATE`    | `kernel.view`     | 63       |
 `PRE_WRITE`        | `kernel.view`     | 33       |
 `POST_WRITE`       | `kernel.view`     | 31       |
-`PRE_SERIALIZE`    | `kernel.request`  | 17       |
-`POST_SERIALIZE`   | `kernel.request`  | 15       |
+`PRE_SERIALIZE`    | `kernel.view`     | 17       |
+`POST_SERIALIZE`   | `kernel.view`     | 15       |
 `PRE_RESPOND`      | `kernel.view`     | 9        |
 `POST_RESPOND`     | `kernel.response` | 0        |
 

core/filters.md

@@ -665,14 +665,22 @@ library. This library must be properly installed and registered to use this exam
 
 namespace App\Filter;
 
-use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter;
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 
-final class RegexpFilter extends AbstractFilter
+final class RegexpFilter extends AbstractContextAwareFilter
 {
     protected function filterProperty(string $property, $value, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null)
     {
+        // otherwise filter is applied to order and page as well
+        if (
+            !$this->isPropertyEnabled($property, $resourceClass) ||
+            !$this->isPropertyMapped($property, $resourceClass)
+        ) {
+            return;
+        }
+        
         $parameterName = $queryNameGenerator->generateParameterName($property); // Generate a unique parameter name to avoid collisions with other filters
         $queryBuilder
             ->andWhere(sprintf('REGEXP(o.%s, :%s) = 1', $property, $parameterName))

core/performance.md

@@ -35,10 +35,10 @@ Sometimes you need individual resources like `/me`. To work properly with Varnis
 
 declare(strict_types=1);
 
-namespace AppBundle\EventSubscriber;
+namespace App\EventSubscriber;
 
 use ApiPlatform\Core\EventListener\EventPriorities;
-use AppBundle\Entity\User;
+use App\Entity\User;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;

core/swagger.md

@@ -46,7 +46,7 @@ final class SwaggerDecorator implements NormalizerInterface
 
         $customDefinition = [
             'name' => 'fields',
-            'definition' => 'Fields to remove of the outpout',
+            'definition' => 'Fields to remove of the output',
             'default' => 'id',
             'in' => 'query',
         ];

core/validation.md

@@ -13,14 +13,14 @@ the `@ApiResource` annotation:
 
 ```php
 <?php
-// src/AppBundle/Entity/Product.php
+// src/Entity/Product.php
 
-namespace AppBundle\Entity;
+namespace App\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
+use App\Validator\Constraints\MinimalProperties; // A custom constraint
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert; // Symfony's built-in constraints
-use AppBundle\Validator\Constraints\MinimalProperties; // A custom constraint
 
 /**
  * A product.
@@ -63,9 +63,9 @@ Here is a custom constraint and the related validator:
 
 ```php
 <?php
-// src/AppBundle/Validator/Constraints/MinimalProperties.php
+// src/Validator/Constraints/MinimalProperties.php
 
-namespace AppBundle\Validator\Constraints;
+namespace App\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
@@ -80,9 +80,9 @@ class MinimalProperties extends Constraint
 
 ```php
 <?php
-// src/AppBundle/Validator/Constraints/MinimalPropertiesValidator.php
+// src/Validator/Constraints/MinimalPropertiesValidator.php
 
-namespace AppBundle\Validator\Constraints;
+namespace App\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;