Move some namespaces on repository

docs/configuration.md

@@ -71,7 +71,7 @@ namespace App\Repository;
 
 use App\Entity\Book;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 class BookRepository extends ServiceEntityRepository implements RepositoryInterface
 {

docs/configure_your_operations.md

@@ -35,9 +35,9 @@ There are some basic CRUD operations and more.
 ```php
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Index;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 #[Index]

docs/configure_your_resource.md

@@ -40,8 +40,8 @@ It will configure your entity as a Sylius resource.
 ```php
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 class Book implements ResourceInterface
@@ -78,8 +78,8 @@ It defines the resource name.
 ```php
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource(name: 'cart')]
 class Order implements ResourceInterface
@@ -107,8 +107,8 @@ It defines the resource plural name.
 ```php
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource(pluralName: 'library')]
 class Book implements ResourceInterface
@@ -124,7 +124,7 @@ As an example, on an `index` operation these Twig variables will be available:
 | Name              | Type                                      |
 |-------------------|-------------------------------------------|
 | resources         | Pagerfanta\Pagerfanta                     |
-| library           | APagerfanta\Pagerfanta                    |
+| library           | Pagerfanta\Pagerfanta                     |
 | operation         | Sylius\Resource\Metadata\Index            |
 | resource_metadata | Sylius\Resource\Metadata\ResourceMetadata |
 | app               | Symfony\Bridge\Twig\AppVariable           |
@@ -136,8 +136,8 @@ It defines the simple vars that you can use on your templates.
 ```php
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource(vars: ['header' => 'Library', 'subheader' => 'Managing your library'])]
 class Book implements ResourceInterface

docs/create_new_resource.md

@@ -140,7 +140,7 @@ use App\Entity\Book;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\ResourceRepositoryTrait;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 /**
  * @extends ServiceEntityRepository<Book>

docs/redirect.md

@@ -30,10 +30,10 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Create;
 use Sylius\Resource\Metadata\Update;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 #[Create(redirectToRoute: 'app_book_update')]
@@ -65,9 +65,9 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Create;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 #[Create(

docs/resource_factories.md

@@ -95,9 +95,9 @@ declare(strict_types=1);
 
 namespace App\Entity\Book;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Create;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 #[Create(
@@ -129,7 +129,7 @@ declare(strict_types=1);
 namespace App\Factory;
 
 use App\Entity\Book;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Factory\FactoryInterface;
 
 final class BookFactory implements FactoryInterface
@@ -240,12 +240,13 @@ namespace App\Entity\Book;
 use App\Factory\BookFactory;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Create;
+use Sylius\Resource\Model\ResourceInterface
 
 #[AsResource]
 #[Create(
     factory: [BookFactory::class, 'create'], 
 )]
-class Book implements \Sylius\Resource\Model\ResourceInterface
+class Book implements ResourceInterface
 {
 }
 ```

docs/responders.md

@@ -66,9 +66,9 @@ Use it on your operation.
 
 namespace App\Entity;
 
-use Sylius\Resource\Model\ResourceInterface;
 use Sylius\Resource\Metadata\AsResource;
 use Sylius\Resource\Metadata\Show;
+use Sylius\Resource\Model\ResourceInterface;
 
 #[AsResource]
 #[Show(

phpstan.neon

@@ -29,6 +29,7 @@ parameters:
         - %currentWorkingDirectory%/src/Component/Generator/*
         - %currentWorkingDirectory%/src/Component/Model/*
         - %currentWorkingDirectory%/src/Component/Reflection/ClassReflection.php
+        - %currentWorkingDirectory%/src/Component/Repository/*
         - %currentWorkingDirectory%/src/Component/spec/*
         - %currentWorkingDirectory%/src/Component/Storage/*
         - %currentWorkingDirectory%/src/Component/Tests/*
@@ -57,8 +58,8 @@ parameters:
         - '/Method Sylius\\Resource\\Model\\ResourceInterface::getId\(\) has no return typehint specified./'
         - '/Method Sylius\\Resource\\Model\\TimestampableInterface::setCreatedAt\(\) has no return typehint specified./'
         - '/Method Sylius\\Resource\\Model\\TimestampableInterface::setUpdatedAt\(\) has no return typehint specified./'
-        - '/Method Sylius\\Component\\Resource\\Repository\\InMemoryRepository::findBy\(\) has parameter \$limit with no type specified./'
-        - '/Method Sylius\\Component\\Resource\\Repository\\InMemoryRepository::findBy\(\) has parameter \$offset with no type specified./'
+        - '/Method Sylius\\Resource\\Doctrine\\Persistence\\InMemoryRepository::findBy\(\) has parameter \$limit with no type specified./'
+        - '/Method Sylius\\Resource\\Doctrine\\Persistence\\InMemoryRepository::findBy\(\) has parameter \$offset with no type specified./'
         - '/Method Symfony\\Component\\Routing\\RouteCollection::add\(\) invoked with 3 parameters, 2 required\./'
         - '/Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required\./'
         - '/Parameter \#1 \$currentPage of method Pagerfanta\\Pagerfanta<mixed>::setCurrentPage\(\) expects int<1, max>, int given\./'

psalm.xml

@@ -88,26 +88,26 @@
 
         <InvalidReturnStatement>
             <errorLevel type="suppress">
-                <file name="src/Component/Repository/InMemoryRepository.php" />
+                <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
                 <file name="src/Bundle/Grid/Parser/OptionsParser.php" />
             </errorLevel>
         </InvalidReturnStatement>
 
         <InvalidReturnType>
             <errorLevel type="suppress">
-                <file name="src/Component/Repository/InMemoryRepository.php" />
+                <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
             </errorLevel>
         </InvalidReturnType>
 
         <LessSpecificImplementedReturnType>
             <errorLevel type="suppress">
-                <file name="src/Component/Repository/InMemoryRepository.php" />
+                <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
             </errorLevel>
         </LessSpecificImplementedReturnType>
 
         <LessSpecificReturnStatement>
             <errorLevel type="suppress">
-                <file name="src/Component/Repository/InMemoryRepository.php" />
+                <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
             </errorLevel>
         </LessSpecificReturnStatement>
 
@@ -122,7 +122,7 @@
         <MissingParamType>
             <errorLevel type="suppress">
                 <file name="src/Bundle/Routing/ResourceLoader.php" />
-                <file name="src/Component/Repository/InMemoryRepository.php" />
+                <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
             </errorLevel>
         </MissingParamType>
 
@@ -194,10 +194,11 @@
             <errorLevel type="suppress">
                 <directory name="src/Component/Annotation" />
                 <directory name="src/Component/Factory" />
-                <directory name="src/Component/Metadata" />
                 <directory name="src/Component/Generator" />
+                <directory name="src/Component/Metadata" />
                 <directory name="src/Component/Model" />
                 <directory name="src/Component/Reflection" />
+                <directory name="src/Component/Repository" />
                 <directory name="src/Component/Storage" />
                 <file name="src/Bundle/Event/ResourceControllerEvent.php" />
             </errorLevel>
@@ -223,9 +224,10 @@
         <UnrecognizedStatement>
             <errorLevel type="suppress">
                 <directory name="src/Component/Factory" />
-                <directory name="src/Component/Metadata" />
                 <directory name="src/Component/Generator" />
+                <directory name="src/Component/Metadata" />
                 <directory name="src/Component/Model" />
+                <directory name="src/Component/Repository" />
                 <directory name="src/Component/Storage" />
             </errorLevel>
         </UnrecognizedStatement>

src/Bundle/Controller/ResourceController.php

@@ -18,8 +18,8 @@
 use Sylius\Bundle\ResourceBundle\Event\ResourceControllerEvent;
 use Sylius\Component\Resource\Exception\DeleteHandlingException;
 use Sylius\Component\Resource\Exception\UpdateHandlingException;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Resource\ResourceActions;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Factory\FactoryInterface;
 use Sylius\Resource\Metadata\MetadataInterface;
 use Sylius\Resource\Model\ResourceInterface;

src/Bundle/Controller/ResourceDeleteHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 final class ResourceDeleteHandler implements ResourceDeleteHandlerInterface

src/Bundle/Controller/ResourceDeleteHandlerInterface.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 interface ResourceDeleteHandlerInterface

src/Bundle/Controller/ResourcesCollectionProvider.php

@@ -17,7 +17,7 @@
 use Hateoas\Representation\Factory\PagerfantaFactory;
 use Pagerfanta\Pagerfanta;
 use Sylius\Bundle\ResourceBundle\Grid\View\ResourceGridView;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 final class ResourcesCollectionProvider implements ResourcesCollectionProviderInterface
 {

src/Bundle/Controller/ResourcesCollectionProviderInterface.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 interface ResourcesCollectionProviderInterface
 {

src/Bundle/Controller/ResourcesResolver.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 final class ResourcesResolver implements ResourcesResolverInterface
 {

src/Bundle/Controller/ResourcesResolverInterface.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 interface ResourcesResolverInterface
 {

src/Bundle/Controller/SingleResourceProvider.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 final class SingleResourceProvider implements SingleResourceProviderInterface

src/Bundle/Controller/SingleResourceProviderInterface.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Controller;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 interface SingleResourceProviderInterface

src/Bundle/Doctrine/ODM/MongoDB/DocumentRepository.php

@@ -17,7 +17,7 @@
 use Doctrine\ODM\MongoDB\DocumentRepository as BaseDocumentRepository;
 use Pagerfanta\Doctrine\MongoDBODM\QueryAdapter;
 use Pagerfanta\Pagerfanta;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 trigger_deprecation('sylius/resource-bundle', '1.3', 'The "%s" class is deprecated. Doctrine MongoDB and PHPCR support will no longer be supported in 2.0.', DocumentRepository::class);

src/Bundle/Doctrine/ODM/PHPCR/DocumentRepository.php

@@ -17,7 +17,7 @@
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
 use Pagerfanta\Doctrine\PHPCRODM\QueryAdapter;
 use Pagerfanta\Pagerfanta;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 trigger_deprecation('sylius/resource-bundle', '1.3', 'The "%s" class is deprecated. Doctrine MongoDB and PHPCR support will no longer be supported in 2.0.', DocumentRepository::class);

src/Bundle/Doctrine/ORM/EntityRepository.php

@@ -14,7 +14,7 @@
 namespace Sylius\Bundle\ResourceBundle\Doctrine\ORM;
 
 use Doctrine\ORM\EntityRepository as BaseEntityRepository;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 /** @psalm-suppress DeprecatedInterface */
 class EntityRepository extends BaseEntityRepository implements RepositoryInterface

src/Bundle/Form/DataTransformer/ResourceToIdentifierTransformer.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\Form\DataTransformer;
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;

src/Bundle/Form/Type/ResourceAutocompleteChoiceType.php

@@ -17,7 +17,7 @@
 use Sylius\Bundle\ResourceBundle\Form\DataTransformer\RecursiveTransformer;
 use Sylius\Bundle\ResourceBundle\Form\DataTransformer\ResourceToIdentifierTransformer;
 use Sylius\Component\Registry\ServiceRegistryInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;

src/Bundle/Form/Type/ResourceToIdentifierType.php

@@ -14,7 +14,7 @@
 namespace Sylius\Bundle\ResourceBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\DataTransformer\ResourceToIdentifierTransformer;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Metadata\MetadataInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;

src/Bundle/Grid/Controller/ResourcesResolver.php

@@ -18,7 +18,7 @@
 use Sylius\Bundle\ResourceBundle\Grid\View\ResourceGridViewFactoryInterface;
 use Sylius\Component\Grid\Parameters;
 use Sylius\Component\Grid\Provider\GridProviderInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 final class ResourcesResolver implements ResourcesResolverInterface
 {

src/Bundle/spec/Controller/ResourceControllerSpec.php

@@ -34,8 +34,8 @@
 use Sylius\Bundle\ResourceBundle\Controller\ViewHandlerInterface;
 use Sylius\Bundle\ResourceBundle\Event\ResourceControllerEvent;
 use Sylius\Component\Resource\Exception\DeleteHandlingException;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Resource\ResourceActions;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Factory\FactoryInterface;
 use Sylius\Resource\Metadata\MetadataInterface;
 use Sylius\Resource\Model\ResourceInterface;

src/Bundle/spec/Controller/ResourceDeleteHandlerSpec.php

@@ -15,7 +15,7 @@
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceDeleteHandlerInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Sylius\Resource\Model\ResourceInterface;
 
 final class ResourceDeleteHandlerSpec extends ObjectBehavior