From 777f27237f0a66c56b43acdb43f3040366795757 Mon Sep 17 00:00:00 2001 From: Tobias Gross-Vogt <tgros@tugraz.at> Date: Mon, 14 Feb 2022 13:24:06 +0100 Subject: [PATCH] CourseBundle -> BaseCourseBundle --- README.md | 4 ++-- composer.json | 4 ++-- phpunit.xml.dist | 2 +- src/API/CourseProviderInterface.php | 6 +++--- src/Controller/GetAttendeesByCourse.php | 4 ++-- src/Controller/GetCoursesByOrganization.php | 4 ++-- src/Controller/GetCoursesByPerson.php | 4 ++-- src/DataProvider/CourseCollectionDataProvider.php | 6 +++--- src/DataProvider/CourseItemDataProvider.php | 6 +++--- ...ayCourseBundle.php => DbpRelayBaseCourseBundle.php} | 4 ++-- src/DependencyInjection/Configuration.php | 2 +- ...seExtension.php => DbpRelayBaseCourseExtension.php} | 4 ++-- src/Entity/Course.php | 6 +++--- src/Entity/CourseAttendee.php | 4 ++-- src/Entity/CourseInterface.php | 2 +- src/Entity/CourseTrait.php | 2 +- src/Resources/config/services.yaml | 10 +++++----- src/Service/DummyCourseProvider.php | 8 ++++---- tests/ApiTest.php | 2 +- tests/Kernel.php | 6 +++--- 20 files changed, 45 insertions(+), 45 deletions(-) rename src/{DbpRelayCourseBundle.php => DbpRelayBaseCourseBundle.php} (71%) rename src/DependencyInjection/{DbpRelayCourseExtension.php => DbpRelayBaseCourseExtension.php} (89%) diff --git a/README.md b/README.md index a709b60..5199a89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DbpRelayCourseBundle +# DbpRelayBaseCourseBundle This Symfony bundle can be used as a template for creating new bundles for the DBP Relay project. @@ -22,7 +22,7 @@ See [Generate DBP Symfony bundle](https://dbp-demo.tugraz.at/dev-guide/relay/nam * Copy the repo contents * Adjust the package name in `composer.json`, in this example we'll pretend you named your bundle `dbp/relay-your-bundle` * Invent a new PHP namespace and adjust it in all PHP files -* Rename `src/DbpRelayCourseBundle` and `DependencyInjection/DbpRelayCourseExtension` to match the new project name +* Rename `src/DbpRelayBaseCourseBundle` and `DependencyInjection/DbpRelayCourseExtension` to match the new project name ## Integration into the API Server diff --git a/composer.json b/composer.json index 29f622e..a4d40b8 100644 --- a/composer.json +++ b/composer.json @@ -29,12 +29,12 @@ ], "autoload": { "psr-4": { - "Dbp\\Relay\\CourseBundle\\": "src/" + "Dbp\\Relay\\BaseCourseBundle\\": "src/" } }, "autoload-dev": { "psr-4": { - "Dbp\\Relay\\CourseBundle\\Tests\\": "tests/" + "Dbp\\Relay\\BaseCourseBundle\\Tests\\": "tests/" } }, "config": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e188728..9cdc5e4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,7 +12,7 @@ <server name="APP_ENV" value="test" force="true"/> <server name="SHELL_VERBOSITY" value="-1"/> <server name="SYMFONY_DEPRECATIONS_HELPER" value='max[direct]=0&quiet[]=indirect'/> - <server name="KERNEL_CLASS" value="Dbp\Relay\CourseBundle\Tests\Kernel"/> + <server name="KERNEL_CLASS" value="Dbp\Relay\BaseCourseBundle\Tests\Kernel"/> </php> <testsuites> <testsuite name="Project Test Suite"> diff --git a/src/API/CourseProviderInterface.php b/src/API/CourseProviderInterface.php index bb27f20..db049e1 100644 --- a/src/API/CourseProviderInterface.php +++ b/src/API/CourseProviderInterface.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\API; +namespace Dbp\Relay\BaseCourseBundle\API; -use Dbp\Relay\CourseBundle\Entity\Course; -use Dbp\Relay\CourseBundle\Entity\CourseAttendee; +use Dbp\Relay\BaseCourseBundle\Entity\Course; +use Dbp\Relay\BaseCourseBundle\Entity\CourseAttendee; interface CourseProviderInterface { diff --git a/src/Controller/GetAttendeesByCourse.php b/src/Controller/GetAttendeesByCourse.php index 31f5a4a..c55166e 100644 --- a/src/Controller/GetAttendeesByCourse.php +++ b/src/Controller/GetAttendeesByCourse.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Controller; +namespace Dbp\Relay\BaseCourseBundle\Controller; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Controller/GetCoursesByOrganization.php b/src/Controller/GetCoursesByOrganization.php index c093f49..6dbd3b0 100644 --- a/src/Controller/GetCoursesByOrganization.php +++ b/src/Controller/GetCoursesByOrganization.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Controller; +namespace Dbp\Relay\BaseCourseBundle\Controller; use ApiPlatform\Core\DataProvider\PaginatorInterface; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Controller/GetCoursesByPerson.php b/src/Controller/GetCoursesByPerson.php index 6fa8ca7..8837097 100644 --- a/src/Controller/GetCoursesByPerson.php +++ b/src/Controller/GetCoursesByPerson.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Controller; +namespace Dbp\Relay\BaseCourseBundle\Controller; use ApiPlatform\Core\DataProvider\PaginatorInterface; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; diff --git a/src/DataProvider/CourseCollectionDataProvider.php b/src/DataProvider/CourseCollectionDataProvider.php index 9d386f8..89103f1 100644 --- a/src/DataProvider/CourseCollectionDataProvider.php +++ b/src/DataProvider/CourseCollectionDataProvider.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\DataProvider; +namespace Dbp\Relay\BaseCourseBundle\DataProvider; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; +use Dbp\Relay\BaseCourseBundle\Entity\Course; use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; -use Dbp\Relay\CourseBundle\Entity\Course; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; final class CourseCollectionDataProvider extends AbstractController implements CollectionDataProviderInterface, RestrictedDataProviderInterface diff --git a/src/DataProvider/CourseItemDataProvider.php b/src/DataProvider/CourseItemDataProvider.php index d494724..4b5252b 100644 --- a/src/DataProvider/CourseItemDataProvider.php +++ b/src/DataProvider/CourseItemDataProvider.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\DataProvider; +namespace Dbp\Relay\BaseCourseBundle\DataProvider; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; -use Dbp\Relay\CourseBundle\Entity\Course; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; +use Dbp\Relay\BaseCourseBundle\Entity\Course; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; final class CourseItemDataProvider extends AbstractController implements ItemDataProviderInterface, RestrictedDataProviderInterface diff --git a/src/DbpRelayCourseBundle.php b/src/DbpRelayBaseCourseBundle.php similarity index 71% rename from src/DbpRelayCourseBundle.php rename to src/DbpRelayBaseCourseBundle.php index 79b3e90..9e6eca4 100644 --- a/src/DbpRelayCourseBundle.php +++ b/src/DbpRelayBaseCourseBundle.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle; +namespace Dbp\Relay\BaseCourseBundle; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; -class DbpRelayCourseBundle extends Bundle +class DbpRelayBaseCourseBundle extends Bundle { public function build(ContainerBuilder $container) { diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index ea3012b..2a3f6b1 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\DependencyInjection; +namespace Dbp\Relay\BaseCourseBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; diff --git a/src/DependencyInjection/DbpRelayCourseExtension.php b/src/DependencyInjection/DbpRelayBaseCourseExtension.php similarity index 89% rename from src/DependencyInjection/DbpRelayCourseExtension.php rename to src/DependencyInjection/DbpRelayBaseCourseExtension.php index 36b6958..fcc750d 100644 --- a/src/DependencyInjection/DbpRelayCourseExtension.php +++ b/src/DependencyInjection/DbpRelayBaseCourseExtension.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\DependencyInjection; +namespace Dbp\Relay\BaseCourseBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension; -class DbpRelayCourseExtension extends ConfigurableExtension +class DbpRelayBaseCourseExtension extends ConfigurableExtension { public function loadInternal(array $mergedConfig, ContainerBuilder $container) { diff --git a/src/Entity/Course.php b/src/Entity/Course.php index ca4b802..1c6ceea 100644 --- a/src/Entity/Course.php +++ b/src/Entity/Course.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Entity; +namespace Dbp\Relay\BaseCourseBundle\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use Dbp\Relay\CourseBundle\Controller\GetCoursesByOrganization; -use Dbp\Relay\CourseBundle\Controller\GetCoursesByPerson; +use Dbp\Relay\BaseCourseBundle\Controller\GetCoursesByOrganization; +use Dbp\Relay\BaseCourseBundle\Controller\GetCoursesByPerson; use Symfony\Component\Serializer\Annotation\Groups; /** diff --git a/src/Entity/CourseAttendee.php b/src/Entity/CourseAttendee.php index f995bfe..7ce7bcb 100644 --- a/src/Entity/CourseAttendee.php +++ b/src/Entity/CourseAttendee.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Entity; +namespace Dbp\Relay\BaseCourseBundle\Entity; use ApiPlatform\Core\Annotation\ApiResource; +use Dbp\Relay\BaseCourseBundle\Controller\GetAttendeesByCourse; use Dbp\Relay\BasePersonBundle\Entity\PersonInterface; use Dbp\Relay\BasePersonBundle\Entity\PersonTrait; -use Dbp\Relay\CourseBundle\Controller\GetAttendeesByCourse; use Symfony\Component\Serializer\Annotation\Groups; /** diff --git a/src/Entity/CourseInterface.php b/src/Entity/CourseInterface.php index e080e21..a438edc 100644 --- a/src/Entity/CourseInterface.php +++ b/src/Entity/CourseInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Entity; +namespace Dbp\Relay\BaseCourseBundle\Entity; interface CourseInterface { diff --git a/src/Entity/CourseTrait.php b/src/Entity/CourseTrait.php index fee2a48..c1fa6f0 100644 --- a/src/Entity/CourseTrait.php +++ b/src/Entity/CourseTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Entity; +namespace Dbp\Relay\BaseCourseBundle\Entity; use ApiPlatform\Core\Annotation\ApiProperty; use Symfony\Component\Serializer\Annotation\Groups; diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml index 62573e7..a725920 100644 --- a/src/Resources/config/services.yaml +++ b/src/Resources/config/services.yaml @@ -1,17 +1,17 @@ services: - Dbp\Relay\CourseBundle\Controller\: + Dbp\Relay\BaseCourseBundle\Controller\: resource: '../../Controller' autoconfigure: true autowire: true - Dbp\Relay\CourseBundle\DataProvider\: + Dbp\Relay\BaseCourseBundle\DataProvider\: resource: '../../DataProvider' autowire: true autoconfigure: true - Dbp\Relay\CourseBundle\Service\DummyCourseProvider: + Dbp\Relay\BaseCourseBundle\Service\DummyCourseProvider: autowire: true autoconfigure: true - Dbp\Relay\CourseBundle\API\CourseProviderInterface: - '@Dbp\Relay\CourseBundle\Service\DummyCourseProvider' + Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface: + '@Dbp\Relay\BaseCourseBundle\Service\DummyCourseProvider' diff --git a/src/Service/DummyCourseProvider.php b/src/Service/DummyCourseProvider.php index 3004bdd..80d4b0b 100644 --- a/src/Service/DummyCourseProvider.php +++ b/src/Service/DummyCourseProvider.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Service; +namespace Dbp\Relay\BaseCourseBundle\Service; -use Dbp\Relay\CourseBundle\API\CourseProviderInterface; -use Dbp\Relay\CourseBundle\Entity\Course; -use Dbp\Relay\CourseBundle\Entity\CourseAttendee; +use Dbp\Relay\BaseCourseBundle\API\CourseProviderInterface; +use Dbp\Relay\BaseCourseBundle\Entity\Course; +use Dbp\Relay\BaseCourseBundle\Entity\CourseAttendee; class DummyCourseProvider implements CourseProviderInterface { diff --git a/tests/ApiTest.php b/tests/ApiTest.php index 553e39f..d0feae7 100644 --- a/tests/ApiTest.php +++ b/tests/ApiTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Tests; +namespace Dbp\Relay\BaseCourseBundle\Tests; use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase; use Symfony\Component\HttpFoundation\Response; diff --git a/tests/Kernel.php b/tests/Kernel.php index 988dcbd..ce154ab 100644 --- a/tests/Kernel.php +++ b/tests/Kernel.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Dbp\Relay\CourseBundle\Tests; +namespace Dbp\Relay\BaseCourseBundle\Tests; use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle; +use Dbp\Relay\BaseCourseBundle\DbpRelayBaseCourseBundle; use Dbp\Relay\CoreBundle\DbpRelayCoreBundle; -use Dbp\Relay\CourseBundle\DbpRelayCourseBundle; use Nelmio\CorsBundle\NelmioCorsBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; @@ -30,7 +30,7 @@ class Kernel extends BaseKernel yield new NelmioCorsBundle(); yield new MonologBundle(); yield new ApiPlatformBundle(); - yield new DbpRelayCourseBundle(); + yield new DbpRelayBaseCourseBundle(); yield new DbpRelayCoreBundle(); } -- GitLab