diff --git a/composer.json b/composer.json index 20a0f52..ef30d39 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "Rekalogika\\Rekapager\\Keyset\\": "packages/rekapager-keyset-pagination/src/", "Rekalogika\\Rekapager\\Offset\\": "packages/rekapager-offset-pagination/src/", "Rekalogika\\Rekapager\\Pagerfanta\\": "packages/rekapager-pagerfanta-adapter/src/", - "Rekalogika\\Rekapager\\Symfony\\": "packages/rekapager-bundle/src/" + "Rekalogika\\Rekapager\\Bundle\\": "packages/rekapager-bundle/src/" } }, "autoload-dev": { diff --git a/packages/rekapager-bundle/composer.json b/packages/rekapager-bundle/composer.json index d161629..b6ca213 100644 --- a/packages/rekapager-bundle/composer.json +++ b/packages/rekapager-bundle/composer.json @@ -22,7 +22,7 @@ ], "autoload": { "psr-4": { - "Rekalogika\\Rekapager\\Symfony\\": "src/" + "Rekalogika\\Rekapager\\Bundle\\": "src/" } }, "require": { diff --git a/packages/rekapager-bundle/config/services.php b/packages/rekapager-bundle/config/services.php index 3560ee5..f16d701 100644 --- a/packages/rekapager-bundle/config/services.php +++ b/packages/rekapager-bundle/config/services.php @@ -11,17 +11,17 @@ * that was distributed with this source code. */ +use Rekalogika\Rekapager\Bundle\Contracts\PagerFactoryInterface; +use Rekalogika\Rekapager\Bundle\Contracts\PageUrlGeneratorFactoryInterface; +use Rekalogika\Rekapager\Bundle\Implementation\SymfonyPageIdentifierEncoderLocator; +use Rekalogika\Rekapager\Bundle\Implementation\SymfonyPageUrlGeneratorFactory; +use Rekalogika\Rekapager\Bundle\PagerFactory; +use Rekalogika\Rekapager\Bundle\Twig\RekapagerExtension; +use Rekalogika\Rekapager\Bundle\Twig\RekapagerRuntime; +use Rekalogika\Rekapager\Bundle\Twig\TwigPagerRenderer; use Rekalogika\Rekapager\Contracts\PageIdentifierEncoderLocatorInterface; use Rekalogika\Rekapager\Keyset\PageIdentifierEncoder\SymfonySerializerKeysetPageIdentifierEncoder; use Rekalogika\Rekapager\Offset\OffsetPageIdentifierEncoder; -use Rekalogika\Rekapager\Symfony\Contracts\PagerFactoryInterface; -use Rekalogika\Rekapager\Symfony\Contracts\PageUrlGeneratorFactoryInterface; -use Rekalogika\Rekapager\Symfony\Implementation\SymfonyPageIdentifierEncoderLocator; -use Rekalogika\Rekapager\Symfony\Implementation\SymfonyPageUrlGeneratorFactory; -use Rekalogika\Rekapager\Symfony\PagerFactory; -use Rekalogika\Rekapager\Symfony\Twig\RekapagerExtension; -use Rekalogika\Rekapager\Symfony\Twig\RekapagerRuntime; -use Rekalogika\Rekapager\Symfony\Twig\TwigPagerRenderer; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Serializer\Encoder\DecoderInterface; diff --git a/packages/rekapager-bundle/src/Contracts/ObjectPaginatorInterface.php b/packages/rekapager-bundle/src/Contracts/ObjectPaginatorInterface.php index d4f8fba..42da061 100644 --- a/packages/rekapager-bundle/src/Contracts/ObjectPaginatorInterface.php +++ b/packages/rekapager-bundle/src/Contracts/ObjectPaginatorInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Contracts; +namespace Rekalogika\Rekapager\Bundle\Contracts; use Rekalogika\Rekapager\Contracts\PagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/packages/rekapager-bundle/src/Contracts/PageUrlGeneratorFactoryInterface.php b/packages/rekapager-bundle/src/Contracts/PageUrlGeneratorFactoryInterface.php index d88d3ea..fbd6981 100644 --- a/packages/rekapager-bundle/src/Contracts/PageUrlGeneratorFactoryInterface.php +++ b/packages/rekapager-bundle/src/Contracts/PageUrlGeneratorFactoryInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Contracts; +namespace Rekalogika\Rekapager\Bundle\Contracts; use Rekalogika\Rekapager\Contracts\PageUrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/packages/rekapager-bundle/src/Contracts/PagerFactoryInterface.php b/packages/rekapager-bundle/src/Contracts/PagerFactoryInterface.php index c77815b..bfd9cef 100644 --- a/packages/rekapager-bundle/src/Contracts/PagerFactoryInterface.php +++ b/packages/rekapager-bundle/src/Contracts/PagerFactoryInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Contracts; +namespace Rekalogika\Rekapager\Bundle\Contracts; use Rekalogika\Contracts\Rekapager\PageableInterface; use Rekalogika\Rekapager\Contracts\PagerInterface; diff --git a/packages/rekapager-bundle/src/DependencyInjection/Configuration.php b/packages/rekapager-bundle/src/DependencyInjection/Configuration.php index c18f25b..b4b69a3 100644 --- a/packages/rekapager-bundle/src/DependencyInjection/Configuration.php +++ b/packages/rekapager-bundle/src/DependencyInjection/Configuration.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\DependencyInjection; +namespace Rekalogika\Rekapager\Bundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; diff --git a/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php b/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php index fdc7318..12bda83 100644 --- a/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php +++ b/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\DependencyInjection; +namespace Rekalogika\Rekapager\Bundle\DependencyInjection; use Rekalogika\Contracts\Rekapager\PageIdentifierEncoderInterface; use Symfony\Component\Config\FileLocator; diff --git a/packages/rekapager-bundle/src/Implementation/SymfonyPageIdentifierEncoderLocator.php b/packages/rekapager-bundle/src/Implementation/SymfonyPageIdentifierEncoderLocator.php index 9e036b9..d0d57b1 100644 --- a/packages/rekapager-bundle/src/Implementation/SymfonyPageIdentifierEncoderLocator.php +++ b/packages/rekapager-bundle/src/Implementation/SymfonyPageIdentifierEncoderLocator.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Implementation; +namespace Rekalogika\Rekapager\Bundle\Implementation; use Psr\Container\ContainerInterface; use Rekalogika\Contracts\Rekapager\Exception\LogicException; diff --git a/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGenerator.php b/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGenerator.php index c5da9f3..7662c7d 100644 --- a/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGenerator.php +++ b/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGenerator.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Implementation; +namespace Rekalogika\Rekapager\Bundle\Implementation; use Rekalogika\Rekapager\Contracts\PageUrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGeneratorFactory.php b/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGeneratorFactory.php index 5e3f375..09e3014 100644 --- a/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGeneratorFactory.php +++ b/packages/rekapager-bundle/src/Implementation/SymfonyPageUrlGeneratorFactory.php @@ -11,10 +11,10 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Implementation; +namespace Rekalogika\Rekapager\Bundle\Implementation; +use Rekalogika\Rekapager\Bundle\Contracts\PageUrlGeneratorFactoryInterface; use Rekalogika\Rekapager\Contracts\PageUrlGeneratorInterface; -use Rekalogika\Rekapager\Symfony\Contracts\PageUrlGeneratorFactoryInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; class SymfonyPageUrlGeneratorFactory implements PageUrlGeneratorFactoryInterface diff --git a/packages/rekapager-bundle/src/PagerFactory.php b/packages/rekapager-bundle/src/PagerFactory.php index b11b203..46eeaf7 100644 --- a/packages/rekapager-bundle/src/PagerFactory.php +++ b/packages/rekapager-bundle/src/PagerFactory.php @@ -11,14 +11,14 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony; +namespace Rekalogika\Rekapager\Bundle; use Rekalogika\Contracts\Rekapager\PageableInterface; +use Rekalogika\Rekapager\Bundle\Contracts\PagerFactoryInterface; +use Rekalogika\Rekapager\Bundle\Contracts\PageUrlGeneratorFactoryInterface; use Rekalogika\Rekapager\Contracts\PageIdentifierEncoderLocatorInterface; use Rekalogika\Rekapager\Contracts\PagerInterface; use Rekalogika\Rekapager\Pager\Pager; -use Rekalogika\Rekapager\Symfony\Contracts\PagerFactoryInterface; -use Rekalogika\Rekapager\Symfony\Contracts\PageUrlGeneratorFactoryInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/packages/rekapager-bundle/src/PagerOptions.php b/packages/rekapager-bundle/src/PagerOptions.php index cf536af..6cf00cd 100644 --- a/packages/rekapager-bundle/src/PagerOptions.php +++ b/packages/rekapager-bundle/src/PagerOptions.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony; +namespace Rekalogika\Rekapager\Bundle; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php b/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php index 9e0eeb5..0ab7886 100644 --- a/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php +++ b/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony; +namespace Rekalogika\Rekapager\Bundle; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/packages/rekapager-bundle/src/Twig/RekapagerExtension.php b/packages/rekapager-bundle/src/Twig/RekapagerExtension.php index e6f1c9e..466e80b 100644 --- a/packages/rekapager-bundle/src/Twig/RekapagerExtension.php +++ b/packages/rekapager-bundle/src/Twig/RekapagerExtension.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Twig; +namespace Rekalogika\Rekapager\Bundle\Twig; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/packages/rekapager-bundle/src/Twig/RekapagerRuntime.php b/packages/rekapager-bundle/src/Twig/RekapagerRuntime.php index edac54f..b5012e9 100644 --- a/packages/rekapager-bundle/src/Twig/RekapagerRuntime.php +++ b/packages/rekapager-bundle/src/Twig/RekapagerRuntime.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Twig; +namespace Rekalogika\Rekapager\Bundle\Twig; use Rekalogika\Rekapager\Contracts\PagerInterface; use Twig\Extension\RuntimeExtensionInterface; diff --git a/packages/rekapager-bundle/src/Twig/TwigPagerRenderer.php b/packages/rekapager-bundle/src/Twig/TwigPagerRenderer.php index 456fb31..e699d48 100644 --- a/packages/rekapager-bundle/src/Twig/TwigPagerRenderer.php +++ b/packages/rekapager-bundle/src/Twig/TwigPagerRenderer.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Rekapager\Symfony\Twig; +namespace Rekalogika\Rekapager\Bundle\Twig; use Rekalogika\Rekapager\Contracts\PagerInterface; use Twig\Environment; diff --git a/tests/src/App/Controller/DemoController.php b/tests/src/App/Controller/DemoController.php index f8e8d3c..1faf20e 100644 --- a/tests/src/App/Controller/DemoController.php +++ b/tests/src/App/Controller/DemoController.php @@ -13,8 +13,8 @@ namespace Rekalogika\Rekapager\Tests\App\Controller; -use Rekalogika\Rekapager\Symfony\Contracts\PagerFactoryInterface; -use Rekalogika\Rekapager\Symfony\PagerOptions; +use Rekalogika\Rekapager\Bundle\Contracts\PagerFactoryInterface; +use Rekalogika\Rekapager\Bundle\PagerOptions; use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface; use Rekalogika\Rekapager\Tests\App\Doctrine\SqlLogger; use Rekalogika\Rekapager\Tests\App\Form\PagerParameters; diff --git a/tests/src/App/Kernel.php b/tests/src/App/Kernel.php index aad833a..620e363 100644 --- a/tests/src/App/Kernel.php +++ b/tests/src/App/Kernel.php @@ -15,7 +15,7 @@ use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle; -use Rekalogika\Rekapager\Symfony\RekalogikaRekapagerBundle; +use Rekalogika\Rekapager\Bundle\RekalogikaRekapagerBundle; use Rekalogika\Rekapager\Tests\App\DependencyInjection\DoctrineSqlLoggingPass; use Symfony\Bundle\DebugBundle\DebugBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; diff --git a/tests/src/IntegrationTests/KeysetPageIdentifierTest.php b/tests/src/IntegrationTests/KeysetPageIdentifierTest.php index af864f3..670081c 100644 --- a/tests/src/IntegrationTests/KeysetPageIdentifierTest.php +++ b/tests/src/IntegrationTests/KeysetPageIdentifierTest.php @@ -13,11 +13,11 @@ namespace Rekalogika\Rekapager\Tests\IntegrationTests; +use Rekalogika\Rekapager\Bundle\Implementation\SymfonyPageIdentifierEncoderLocator; use Rekalogika\Rekapager\Contracts\PageIdentifierEncoderLocatorInterface; use Rekalogika\Rekapager\Keyset\Contracts\BoundaryType; use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier; use Rekalogika\Rekapager\Keyset\PageIdentifierEncoder\SymfonySerializerKeysetPageIdentifierEncoder; -use Rekalogika\Rekapager\Symfony\Implementation\SymfonyPageIdentifierEncoderLocator; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; class KeysetPageIdentifierTest extends KernelTestCase