[Api] #1245170 - Replace deprecated exception

Elastic-Suite · Sep 19, 2024 · 092cc71 · 092cc71
1 parent 2bd2f27
commit 092cc71
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,7 +86,6 @@ jobs:
               run: |
                   docker compose -f compose.yml -f compose.ci.yml exec -T php bin/console gally:index:clear --no-interaction
                   docker compose -f compose.yml -f compose.ci.yml exec -T php bin/console hautelook:fixtures:load --no-interaction -vv
-                  docker compose -f compose.yml -f compose.ci.yml exec -T php bin/console doctrine:fixtures:load --append --no-interaction
 
             - name: Coverage
               working-directory: ${{ env.gally-directory }}

diff --git a/src/Catalog/Repository/LocalizedCatalogRepository.php b/src/Catalog/Repository/LocalizedCatalogRepository.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Catalog\Repository;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Gally\Catalog\Entity\LocalizedCatalog;

diff --git a/src/Category/Decoration/SyncCategoryDataAfterInstallRest.php b/src/Category/Decoration/SyncCategoryDataAfterInstallRest.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Category\Decoration;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Gally\Category\Exception\SyncCategoryException;

diff --git a/src/Category/Service/CategoryProductPositionManager.php b/src/Category/Service/CategoryProductPositionManager.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Category\Service;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Gally\Catalog\Entity\Catalog;
 use Gally\Catalog\Entity\LocalizedCatalog;

diff --git a/src/Configuration/Resources/config/api_platform.yaml b/src/Configuration/Resources/config/api_platform.yaml
@@ -13,6 +13,16 @@ api_platform:
             JWT:
                 name: Authorization
                 type: header
+    exception_to_status:
+        # The 4 following handlers are registered by default, keep those lines to prevent unexpected side effects
+        Symfony\Component\Serializer\Exception\ExceptionInterface: 400 # Use a raw status code (recommended)
+        # ApiPlatform\Core\Exception\InvalidArgumentException: !php/const Symfony\Component\HttpFoundation\Response::HTTP_BAD_REQUEST
+        ApiPlatform\Metadata\Exception\InvalidArgumentException: !php/const Symfony\Component\HttpFoundation\Response::HTTP_BAD_REQUEST
+        ApiPlatform\ParameterValidator\Exception\ValidationException: 400
+        Doctrine\ORM\OptimisticLockException: 409
+        # Validation exception
+
+        ApiPlatform\Validator\Exception\ValidationException: !php/const Symfony\Component\HttpFoundation\Response::HTTP_UNPROCESSABLE_ENTITY
     # Good defaults for REST APIs
     defaults:
         stateless: true

diff --git a/src/Doctrine/Filter/SearchFilter.php b/src/Doctrine/Filter/SearchFilter.php
@@ -34,7 +34,7 @@
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
- * Class copied from ApiPlatform\Doctrine\Odm\Filter\SearchFilter as it is a final class we can't extend it.
+ * Class copied from ApiPlatform\Doctrine\Orm\Filter\SearchFilter as it is a final class we can't extend it.
  * To avoid to have to many duplicate code on Gally we prefer to copy this class and remove the final "tag".
  * On unit tests, we added  a test to detect changes in the in future versions of api-platform.
  */

diff --git a/src/Doctrine/Filter/SearchFilterWithDefault.php b/src/Doctrine/Filter/SearchFilterWithDefault.php
@@ -17,7 +17,7 @@
 use ApiPlatform\Api\IriConverterInterface;
 use ApiPlatform\Doctrine\Common\Filter\SearchFilterTrait;
 use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
 use Gally\Doctrine\Filter\SearchFilter as GallySearchFilter;

diff --git a/src/Doctrine/Tests/Unit/SearchFilterTest.php b/src/Doctrine/Tests/Unit/SearchFilterTest.php
@@ -20,9 +20,9 @@ class SearchFilterTest extends AbstractTestCase
     public function testOriginalFileHasChanged(): void
     {
         $this->assertEquals(
-            '82d4d86b6bec37d045f2cd602af9f3d4dfff325d',
-            sha1_file('vendor/api-platform/core/src/Doctrine/Odm/Filter/SearchFilter.php'),
-            'The original \ApiPlatform\Doctrine\Odm\Filter\SearchFilter file has been updated, please backport this changes in \Gally\Doctrine\Filter\SearchFilter'
+            'd59474c1ebd88634a8e77781c32ea30271094675',
+            sha1_file('vendor/api-platform/core/src/Doctrine/Orm/Filter/SearchFilter.php'),
+            'The original \ApiPlatform\Doctrine\Orm\Filter\SearchFilter file has been updated, please backport this changes in \Gally\Doctrine\Filter\SearchFilter'
         );
     }
 }
diff --git a/src/Index/MutationResolver/BulkIndexMutation.php b/src/Index/MutationResolver/BulkIndexMutation.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Index\MutationResolver;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\GraphQl\Resolver\MutationResolverInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Index\Dto\Bulk;
 use Gally\Index\Entity\Index;
 use Gally\Index\Repository\Index\IndexRepositoryInterface;

diff --git a/src/Index/MutationResolver/CreateIndexMutation.php b/src/Index/MutationResolver/CreateIndexMutation.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Index\MutationResolver;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\GraphQl\Resolver\MutationResolverInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Catalog\Repository\LocalizedCatalogRepository;
 use Gally\Exception\LogicException;
 use Gally\Index\Service\IndexOperation;

diff --git a/src/Index/MutationResolver/InstallIndexMutation.php b/src/Index/MutationResolver/InstallIndexMutation.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Index\MutationResolver;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\GraphQl\Resolver\MutationResolverInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Index\Entity\Index;
 use Gally\Index\Repository\Index\IndexRepositoryInterface;
 use Gally\Index\Service\IndexOperation;

diff --git a/src/Index/MutationResolver/RefreshIndexMutation.php b/src/Index/MutationResolver/RefreshIndexMutation.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Index\MutationResolver;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\GraphQl\Resolver\MutationResolverInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Index\Entity\Index;
 use Gally\Index\Repository\Index\IndexRepositoryInterface;
 

diff --git a/src/Index/Repository/Document/DocumentRepository.php b/src/Index/Repository/Document/DocumentRepository.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Index\Repository\Document;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Index\Dto\Bulk;
 use Gally\Index\Repository\Index\IndexRepository;
 

diff --git a/src/Index/Service/SelfReindexOperation.php b/src/Index/Service/SelfReindexOperation.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Index\Service;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Catalog\Repository\LocalizedCatalogRepository;
 use Gally\Index\Entity\Index;
 use Gally\Index\Entity\Index\SelfReindex;

diff --git a/src/Index/State/CreateIndexProcessor.php b/src/Index/State/CreateIndexProcessor.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Index\State;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Gally\Catalog\Repository\LocalizedCatalogRepository;

diff --git a/src/Index/State/InstallIndexProcessor.php b/src/Index/State/InstallIndexProcessor.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Index\State;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Gally\Index\Dto\InstallIndexDto;

diff --git a/src/Index/State/RefreshIndexProcessor.php b/src/Index/State/RefreshIndexProcessor.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Index\State;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Gally\Index\Dto\RefreshIndexDto;

diff --git a/src/Menu/Service/MenuBuilder.php b/src/Menu/Service/MenuBuilder.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Menu\Service;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Menu\Entity\Menu;
 use Gally\Menu\Entity\MenuItem;
 use Symfony\Contracts\Translation\TranslatorInterface;

diff --git a/src/Metadata/Repository/MetadataRepository.php b/src/Metadata/Repository/MetadataRepository.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Metadata\Repository;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;

diff --git a/src/Metadata/State/SourceFieldOptionProcessor.php b/src/Metadata/State/SourceFieldOptionProcessor.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Metadata\State;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\DeleteOperationInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Doctrine\Common\Collections\ArrayCollection;

diff --git a/src/Metadata/State/SourceFieldProcessor.php b/src/Metadata/State/SourceFieldProcessor.php
@@ -13,8 +13,8 @@
 
 namespace Gally\Metadata\State;
 
-use ApiPlatform\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\DeleteOperationInterface;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Doctrine\Common\Collections\ArrayCollection;

diff --git a/src/Metadata/Validator/SourceFieldDataValidator.php b/src/Metadata/Validator/SourceFieldDataValidator.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Metadata\Validator;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Gally\Catalog\Repository\LocalizedCatalogRepository;
 use Gally\Metadata\Entity\SourceField;

diff --git a/src/Metadata/Validator/SourceFieldOptionDataValidator.php b/src/Metadata/Validator/SourceFieldOptionDataValidator.php
@@ -13,7 +13,7 @@
 
 namespace Gally\Metadata\Validator;
 
-use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use Gally\Catalog\Repository\LocalizedCatalogRepository;
 use Gally\Metadata\Entity\SourceField;