diff --git a/application/symfony/config/packages/doctrine.yaml b/application/symfony/config/packages/doctrine.yaml index 8c3ebc3..24fa211 100644 --- a/application/symfony/config/packages/doctrine.yaml +++ b/application/symfony/config/packages/doctrine.yaml @@ -30,4 +30,4 @@ doctrine: prefix: 'Infinito\Entity' alias: App #resolve_target_entities: - # Infinito\Domain\RequestManagement\Right\RequestedRightServiceInterface: Infinito\Domain\RequestManagement\Right\RequestedRightService2 \ No newline at end of file + # Infinito\Domain\Request\Right\RequestedRightServiceInterface: Infinito\Domain\Request\Right\RequestedRightService2 \ No newline at end of file diff --git a/application/symfony/config/packages/twig.yaml b/application/symfony/config/packages/twig.yaml index 023081f..9751f54 100644 --- a/application/symfony/config/packages/twig.yaml +++ b/application/symfony/config/packages/twig.yaml @@ -5,7 +5,7 @@ twig: form_themes: ['bootstrap_4_layout.html.twig'] globals: layer_action_map: "@Infinito\\Domain\\Layer\\LayerActionMap" - requested_action_service: "@Infinito\\Domain\\RequestManagement\\Action\\RequestedActionService" + requested_action_service: "@Infinito\\Domain\\Request\\Action\\RequestedActionService" action_icon_class_map: "@Infinito\\Domain\\TwigManagement\\ActionIconClassMap" layer_icon_class_map: "@Infinito\\Domain\\TwigManagement\\LayerIconClassMap" action_template_name_service: "@Infinito\\Domain\\TemplateManagement\\ActionTemplateNameServiceInterface" diff --git a/application/symfony/config/services.yaml b/application/symfony/config/services.yaml index 0616f37..048187d 100644 --- a/application/symfony/config/services.yaml +++ b/application/symfony/config/services.yaml @@ -38,15 +38,15 @@ services: Infinito\Domain\TemplateManagement\TemplateNameServiceInterface: "@Infinito\\Domain\\TemplateManagement\\TemplateNameService" # Needed for integration tests - Infinito\Domain\RequestManagement\Entity\RequestedEntityService: + Infinito\Domain\Request\Entity\RequestedEntityService: public: true - Infinito\Domain\RequestManagement\Right\RequestedRightService: + Infinito\Domain\Request\Right\RequestedRightService: public: true Infinito\Domain\UserManagement\UserSourceDirectorService: public: true - Infinito\Domain\RequestManagement\User\RequestedUserService: + Infinito\Domain\Request\User\RequestedUserService: public: true - Infinito\Domain\RequestManagement\Action\RequestedActionService: + Infinito\Domain\Request\Action\RequestedActionService: public: true Infinito\Domain\Form\RequestedActionFormBuilderService: public: true diff --git a/application/symfony/src/Attribut/RequestedEntityAttribut.php b/application/symfony/src/Attribut/RequestedEntityAttribut.php index 46037cd..2d74742 100644 --- a/application/symfony/src/Attribut/RequestedEntityAttribut.php +++ b/application/symfony/src/Attribut/RequestedEntityAttribut.php @@ -2,7 +2,7 @@ namespace Infinito\Attribut; -use Infinito\Domain\RequestManagement\Entity\RequestedEntityInterface; +use Infinito\Domain\Request\Entity\RequestedEntityInterface; /** * @author kevinfrantz diff --git a/application/symfony/src/Attribut/RequestedEntityAttributInterface.php b/application/symfony/src/Attribut/RequestedEntityAttributInterface.php index 0beac71..5380628 100644 --- a/application/symfony/src/Attribut/RequestedEntityAttributInterface.php +++ b/application/symfony/src/Attribut/RequestedEntityAttributInterface.php @@ -2,7 +2,7 @@ namespace Infinito\Attribut; -use Infinito\Domain\RequestManagement\Entity\RequestedEntityInterface; +use Infinito\Domain\Request\Entity\RequestedEntityInterface; /** * @author kevinfrantz diff --git a/application/symfony/src/Attribut/RequestedRightAttribut.php b/application/symfony/src/Attribut/RequestedRightAttribut.php index d75c4a2..7c0c002 100644 --- a/application/symfony/src/Attribut/RequestedRightAttribut.php +++ b/application/symfony/src/Attribut/RequestedRightAttribut.php @@ -2,7 +2,7 @@ namespace Infinito\Attribut; -use Infinito\Domain\RequestManagement\Right\RequestedRightInterface; +use Infinito\Domain\Request\Right\RequestedRightInterface; /** * @author kevinfrantz diff --git a/application/symfony/src/Attribut/RequestedRightAttributInterface.php b/application/symfony/src/Attribut/RequestedRightAttributInterface.php index 7ab636a..ae78bd9 100644 --- a/application/symfony/src/Attribut/RequestedRightAttributInterface.php +++ b/application/symfony/src/Attribut/RequestedRightAttributInterface.php @@ -2,7 +2,7 @@ namespace Infinito\Attribut; -use Infinito\Domain\RequestManagement\Right\RequestedRightInterface; +use Infinito\Domain\Request\Right\RequestedRightInterface; /** * @author kevinfrantz diff --git a/application/symfony/src/Controller/API/Rest/LayerController.php b/application/symfony/src/Controller/API/Rest/LayerController.php index fe78b0e..012456c 100644 --- a/application/symfony/src/Controller/API/Rest/LayerController.php +++ b/application/symfony/src/Controller/API/Rest/LayerController.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\HttpFoundation\Request; use Infinito\Controller\API\AbstractAPIController; -use Infinito\Domain\RequestManagement\Action\RequestedActionServiceInterface; +use Infinito\Domain\Request\Action\RequestedActionServiceInterface; use Infinito\Domain\MVC\MVCRoutineServiceInterface; use Infinito\DBAL\Types\ActionType; use Infinito\Attribut\ClassAttributInterface; diff --git a/application/symfony/src/Domain/Action/ActionDependenciesDAOService.php b/application/symfony/src/Domain/Action/ActionDependenciesDAOService.php index ca65a7f..9ca395e 100644 --- a/application/symfony/src/Domain/Action/ActionDependenciesDAOService.php +++ b/application/symfony/src/Domain/Action/ActionDependenciesDAOService.php @@ -2,7 +2,7 @@ namespace Infinito\Domain\Action; -use Infinito\Domain\RequestManagement\Action\RequestedActionInterface; +use Infinito\Domain\Request\Action\RequestedActionInterface; use Infinito\Domain\Repository\LayerRepositoryFactoryServiceInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -10,7 +10,7 @@ use Infinito\Repository\RepositoryInterface; use Symfony\Component\Form\FormBuilderInterface; use Doctrine\ORM\EntityManagerInterface; use Infinito\Domain\Form\RequestedActionFormBuilderServiceInterface; -use Infinito\Domain\RequestManagement\Action\RequestedActionServiceInterface; +use Infinito\Domain\Request\Action\RequestedActionServiceInterface; use Infinito\Domain\SecureManagement\SecureRequestedRightCheckerServiceInterface; /** diff --git a/application/symfony/src/Domain/Action/ActionDependenciesDAOServiceInterface.php b/application/symfony/src/Domain/Action/ActionDependenciesDAOServiceInterface.php index 8aa132c..b2b5b1c 100644 --- a/application/symfony/src/Domain/Action/ActionDependenciesDAOServiceInterface.php +++ b/application/symfony/src/Domain/Action/ActionDependenciesDAOServiceInterface.php @@ -2,7 +2,7 @@ namespace Infinito\Domain\Action; -use Infinito\Domain\RequestManagement\Action\RequestedActionInterface; +use Infinito\Domain\Request\Action\RequestedActionInterface; use Symfony\Component\HttpFoundation\Request; use Infinito\Repository\RepositoryInterface; use Symfony\Component\Form\FormBuilderInterface; diff --git a/application/symfony/src/Domain/Dom/EntityDomService.php b/application/symfony/src/Domain/Dom/EntityDomService.php index cebfba5..a12406d 100644 --- a/application/symfony/src/Domain/Dom/EntityDomService.php +++ b/application/symfony/src/Domain/Dom/EntityDomService.php @@ -4,7 +4,7 @@ namespace Infinito\Domain\Dom; use Infinito\Entity\EntityInterface; use Doctrine\Common\Collections\Collection; -use Infinito\Domain\RequestManagement\Entity\RequestedEntityServiceInterface; +use Infinito\Domain\Request\Entity\RequestedEntityServiceInterface; use Infinito\DBAL\Types\Meta\Right\LayerType; use Infinito\Domain\Layer\LayerInterfaceMap; use FOS\UserBundle\Model\UserInterface; diff --git a/application/symfony/src/Domain/Form/RequestedActionFormBuilder.php b/application/symfony/src/Domain/Form/RequestedActionFormBuilder.php index 778fd78..622d4a1 100644 --- a/application/symfony/src/Domain/Form/RequestedActionFormBuilder.php +++ b/application/symfony/src/Domain/Form/RequestedActionFormBuilder.php @@ -3,7 +3,7 @@ namespace Infinito\Domain\Form; use Symfony\Component\Form\FormBuilderInterface; -use Infinito\Domain\RequestManagement\Action\RequestedActionInterface; +use Infinito\Domain\Request\Action\RequestedActionInterface; use Symfony\Component\Form\FormFactoryInterface; use Infinito\Exception\Attribut\UndefinedAttributException; diff --git a/application/symfony/src/Domain/Form/RequestedActionFormBuilderInterface.php b/application/symfony/src/Domain/Form/RequestedActionFormBuilderInterface.php index 02efee0..785a217 100644 --- a/application/symfony/src/Domain/Form/RequestedActionFormBuilderInterface.php +++ b/application/symfony/src/Domain/Form/RequestedActionFormBuilderInterface.php @@ -3,7 +3,7 @@ namespace Infinito\Domain\Form; use Symfony\Component\Form\FormBuilderInterface; -use Infinito\Domain\RequestManagement\Action\RequestedActionInterface; +use Infinito\Domain\Request\Action\RequestedActionInterface; /** * Allowes to create an form which fits to an entity. diff --git a/application/symfony/src/Domain/Form/RequestedActionFormBuilderService.php b/application/symfony/src/Domain/Form/RequestedActionFormBuilderService.php index 6613ec6..ab6b958 100644 --- a/application/symfony/src/Domain/Form/RequestedActionFormBuilderService.php +++ b/application/symfony/src/Domain/Form/RequestedActionFormBuilderService.php @@ -3,7 +3,7 @@ namespace Infinito\Domain\Form; use Symfony\Component\Form\FormBuilderInterface; -use Infinito\Domain\RequestManagement\Action\RequestedActionServiceInterface; +use Infinito\Domain\Request\Action\RequestedActionServiceInterface; use Symfony\Component\Form\FormFactoryInterface; /** diff --git a/application/symfony/src/Domain/Process/ProcessService.php b/application/symfony/src/Domain/Process/ProcessService.php index ff87c41..6e95a2d 100644 --- a/application/symfony/src/Domain/Process/ProcessService.php +++ b/application/symfony/src/Domain/Process/ProcessService.php @@ -2,7 +2,7 @@ namespace Infinito\Domain\Process; -use Infinito\Domain\RequestManagement\Action\RequestedActionServiceInterface; +use Infinito\Domain\Request\Action\RequestedActionServiceInterface; use Infinito\Domain\SecureManagement\SecureRequestedRightCheckerServiceInterface; use Infinito\Domain\Action\ActionHandlerServiceInterface; use Infinito\Entity\Source\Primitive\Text\TextSource; diff --git a/application/symfony/src/Domain/README.md b/application/symfony/src/Domain/README.md index 4f38de8..1a5ff1b 100644 --- a/application/symfony/src/Domain/README.md +++ b/application/symfony/src/Domain/README.md @@ -34,7 +34,7 @@ Maps a path to a namespace. ## Request Management -Offers classes to manage requests for rights, users and sources. A [detailed description](./RequestManagement/README.md) is available. +Offers classes to manage requests for rights, users and sources. A [detailed description](./Request/README.md) is available. ## Right Management ### Right Checker ### Checks if the crud, layer and source combination is granted by a right. diff --git a/application/symfony/src/Domain/RequestManagement/.meta/uml-class-diagram.dia b/application/symfony/src/Domain/Request/.meta/uml-class-diagram.dia similarity index 100% rename from application/symfony/src/Domain/RequestManagement/.meta/uml-class-diagram.dia rename to application/symfony/src/Domain/Request/.meta/uml-class-diagram.dia diff --git a/application/symfony/src/Domain/RequestManagement/.meta/uml-class-diagram.svg b/application/symfony/src/Domain/Request/.meta/uml-class-diagram.svg similarity index 100% rename from application/symfony/src/Domain/RequestManagement/.meta/uml-class-diagram.svg rename to application/symfony/src/Domain/Request/.meta/uml-class-diagram.svg diff --git a/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php b/application/symfony/src/Domain/Request/Action/RequestedAction.php similarity index 67% rename from application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php rename to application/symfony/src/Domain/Request/Action/RequestedAction.php index 010dba8..8c2c806 100644 --- a/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php +++ b/application/symfony/src/Domain/Request/Action/RequestedAction.php @@ -1,9 +1,9 @@