Moved all the entities to the src folder on the core side.

src/Controller/ApiAdminServersController.php

@@ -12,8 +12,8 @@
 use Monarc\BackOffice\Service\ServerService;
 use Monarc\BackOffice\Validator\InputValidator\Server\PostServerDataInputValidator;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\User;
-use Monarc\Core\Model\Entity\UserRole;
+use Monarc\Core\Entity\User;
+use Monarc\Core\Entity\UserRole;
 use Monarc\Core\Service\ConnectedUserService;
 
 class ApiAdminServersController extends AbstractRestfulController

src/Controller/ApiAnrController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\AnrService;
 use Monarc\Core\Validator\InputValidator\Anr\PatchThresholdsDataInputValidator;
 

src/Controller/ApiAnrInstancesConsequencesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceConsequenceService;
 use Monarc\Core\Validator\InputValidator\InstanceConsequence\PatchConsequenceDataInputValidator;
 

src/Controller/ApiAnrInstancesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceService;
 use Monarc\Core\Validator\InputValidator\Instance\CreateInstanceDataInputValidator;
 use Monarc\Core\Validator\InputValidator\Instance\PatchInstanceDataInputValidator;

src/Controller/ApiAnrInstancesMetadataFieldsController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\AnrInstanceMetadataFieldService;
 
 class ApiAnrInstancesMetadataFieldsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrInstancesRisksController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceRiskService;
 use Monarc\Core\Validator\InputValidator\InstanceRisk\UpdateInstanceRiskDataInputValidator;
 

src/Controller/ApiAnrInstancesRisksOpController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceRiskOpService;
 use Monarc\Core\Validator\InputValidator\InstanceRiskOp\PatchInstanceRiskOpDataInputValidator;
 use Monarc\Core\Validator\InputValidator\InstanceRiskOp\UpdateInstanceRiskOpDataInputValidator;

src/Controller/ApiAnrLibraryController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ObjectService;
 
 class ApiAnrLibraryController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrRisksController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceRiskService;
 
 class ApiAnrRisksController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrRisksOpController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\InstanceRiskOpService;
 
 class ApiAnrRisksOpController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrScalesCommentsController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\InputFormatter\ScaleComment\GetScaleCommentsInputFormatter;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ScaleCommentService;
 
 class ApiAnrScalesCommentsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrScalesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ScaleService;
 use Monarc\Core\Validator\InputValidator\Scale\UpdateScalesDataInputValidator;
 

src/Controller/ApiAnrScalesTypesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ScaleImpactTypeService;
 
 class ApiAnrScalesTypesController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiObjectsController.php

@@ -11,7 +11,7 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\InputFormatter\Object\GetObjectInputFormatter;
 use Monarc\Core\InputFormatter\Object\GetObjectsInputFormatter;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ObjectService;
 use Monarc\Core\Validator\InputValidator\Object\PostObjectDataInputValidator;
 

src/Controller/ApiObjectsDuplicationController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\ObjectService;
 
 class ApiObjectsDuplicationController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiOperationalRisksScalesController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\OperationalRiskScaleService;
 
 class ApiOperationalRisksScalesController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiQuestionsChoicesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\AbstractController;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\QuestionChoice;
+use Monarc\Core\Entity\QuestionChoice;
 use Monarc\Core\Model\Table\QuestionChoiceTable;
 use Monarc\Core\Service\QuestionChoiceService;
 

src/Controller/ApiRolfRisksController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\AbstractController;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Measure;
+use Monarc\Core\Entity\Measure;
 use Monarc\Core\Service\RolfRiskService;
 
 /**

src/Controller/ApiSoaScaleCommentController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\Anr;
+use Monarc\Core\Entity\Anr;
 use Monarc\Core\Service\SoaScaleCommentService;
 
 class ApiSoaScaleCommentController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiUserProfileController.php

@@ -8,7 +8,7 @@
 namespace Monarc\BackOffice\Controller;
 
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\UserSuperClass;
+use Monarc\Core\Entity\UserSuperClass;
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\Core\Service\UserProfileService;
 use Laminas\Mvc\Controller\AbstractRestfulController;
@@ -20,9 +20,10 @@ class ApiUserProfileController extends AbstractRestfulController
 
     private UserProfileService $userProfileService;
 
-    private UserSuperClass $connectedUser;
     private PatchProfileDataInputValidator $patchProfileDataInputValidator;
 
+    private UserSuperClass $connectedUser;
+
     public function __construct(
         PatchProfileDataInputValidator $patchProfileDataInputValidator,
         UserProfileService $userProfileService,

src/Controller/ApiUserRecoveryCodesController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\UserSuperClass;
+use Monarc\Core\Entity\UserSuperClass;
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\Core\Table\UserTable;
 use Laminas\Mvc\Controller\AbstractRestfulController;

src/Controller/ApiUserTwoFAController.php

@@ -8,7 +8,7 @@
 namespace Monarc\BackOffice\Controller;
 
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Model\Entity\UserSuperClass;
+use Monarc\Core\Entity\UserSuperClass;
 use RobThree\Auth\TwoFactorAuth;
 use RobThree\Auth\Providers\Qr\EndroidQrCodeProvider;
 use Monarc\Core\Service\ConnectedUserService;

src/Entity/Client.php

@@ -9,8 +9,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
-use Monarc\Core\Model\Entity\Traits\CreateEntityTrait;
-use Monarc\Core\Model\Entity\Traits\UpdateEntityTrait;
+use Monarc\Core\Entity\Traits\CreateEntityTrait;
+use Monarc\Core\Entity\Traits\UpdateEntityTrait;
 
 /**
  * @ORM\Table(name="clients")

src/Entity/ClientModel.php

@@ -8,8 +8,8 @@
 namespace Monarc\BackOffice\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Monarc\Core\Model\Entity\Traits\CreateEntityTrait;
-use Monarc\Core\Model\Entity\Traits\UpdateEntityTrait;
+use Monarc\Core\Entity\Traits\CreateEntityTrait;
+use Monarc\Core\Entity\Traits\UpdateEntityTrait;
 
 /**
  * @ORM\Table(name="clients_models")

src/Entity/Server.php

@@ -9,8 +9,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Monarc\Core\Model\Entity\Traits\CreateEntityTrait;
-use Monarc\Core\Model\Entity\Traits\UpdateEntityTrait;
+use Monarc\Core\Entity\Traits\CreateEntityTrait;
+use Monarc\Core\Entity\Traits\UpdateEntityTrait;
 
 /**
  * @ORM\Table(name="servers")

src/Middleware/AnrValidationMiddleware.php

@@ -11,8 +11,8 @@
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\ResponseFactory;
 use Laminas\Router\RouteMatch;
-use Monarc\Core\Model\Entity\UserRole;
-use Monarc\Core\Model\Entity\UserSuperClass;
+use Monarc\Core\Entity\UserRole;
+use Monarc\Core\Entity\UserSuperClass;
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\Core\Table\AnrTable;
 use Psr\Http\Message\ResponseInterface;

src/Service/ClientService.php

@@ -17,8 +17,8 @@
 use Monarc\BackOffice\Table\ServerTable;
 use Monarc\Core\Exception\Exception;
 use Monarc\Core\InputFormatter\FormattedInputParams;
-use Monarc\Core\Model\Entity\Model;
-use Monarc\Core\Model\Entity\User;
+use Monarc\Core\Entity\Model;
+use Monarc\Core\Entity\User;
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\Core\Table\ModelTable;
 use RuntimeException;

src/Service/ServerService.php

@@ -10,7 +10,7 @@
 use Monarc\BackOffice\Entity\Server;
 use Monarc\BackOffice\Table\ServerTable;
 use Monarc\Core\InputFormatter\FormattedInputParams;
-use Monarc\Core\Model\Entity\User;
+use Monarc\Core\Entity\User;
 use Monarc\Core\Service\ConnectedUserService;
 
 class ServerService

src/Validator/InputValidator/Asset/PostAssetDataInputValidator.php

@@ -8,7 +8,7 @@
 namespace Monarc\BackOffice\Validator\InputValidator\Asset;
 
 use Laminas\Validator\InArray;
-use Monarc\Core\Model\Entity\AssetSuperClass;
+use Monarc\Core\Entity\AssetSuperClass;
 use Monarc\Core\Validator\InputValidator\Asset\PostAssetDataInputValidator as CorePostAssetDataInputValidator;
 
 class PostAssetDataInputValidator extends CorePostAssetDataInputValidator

src/Validator/InputValidator/Threat/PostThreatDataInputValidator.php

@@ -8,7 +8,7 @@
 namespace Monarc\BackOffice\Validator\InputValidator\Threat;
 
 use Laminas\Validator\InArray;
-use Monarc\Core\Model\Entity\ThreatSuperClass;
+use Monarc\Core\Entity\ThreatSuperClass;
 use Monarc\Core\Validator\InputValidator\Threat\PostThreatDataInputValidator as CorePostThreatDataInputValidator;
 
 class PostThreatDataInputValidator extends CorePostThreatDataInputValidator

src/Validator/InputValidator/Vulnerability/PostVulnerabilityDataInputValidator.php

@@ -8,7 +8,7 @@
 namespace Monarc\BackOffice\Validator\InputValidator\Vulnerability;
 
 use Laminas\Validator\InArray;
-use Monarc\Core\Model\Entity\VulnerabilitySuperClass;
+use Monarc\Core\Entity\VulnerabilitySuperClass;
 use Monarc\Core\Validator\InputValidator\Vulnerability;
 
 class PostVulnerabilityDataInputValidator extends Vulnerability\PostVulnerabilityDataInputValidator