Nettoyage des services : application, applicationsretirees (71ef7efa) · Commits · open-source / emc2

module/Application/src/Application/Service/Application/ApplicationGroupeService.php

+0 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,6 @@ use UnicaenApp\Exception\RuntimeException;
		use Zend\Mvc\Controller\AbstractActionController;

		class ApplicationGroupeService {
		// use EntityManagerAwareTrait;
		// use UserServiceAwareTrait;
		// use DateTimeAwareTrait;
		use GestionEntiteHistorisationTrait;
		use RendererAwareTrait;

module/Application/src/Application/Service/Application/ApplicationGroupeServiceAwareTrait.php

+2 −4

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@

		namespace Application\Service\Application;

		use Application\Service\Application\ApplicationGroupeService;

		trait ApplicationGroupeServiceAwareTrait {

		/** @var ApplicationGroupeService */
		@@ -12,7 +10,7 @@ trait ApplicationGroupeServiceAwareTrait {
		/**
		* @return ApplicationGroupeService
		*/
		public function getApplicationGroupeService()
		public function getApplicationGroupeService() : ApplicationGroupeService
		{
		return $this->applicationGroupeService;
		}
		@@ -21,7 +19,7 @@ trait ApplicationGroupeServiceAwareTrait {
		* @param ApplicationGroupeService $applicationGroupeService
		* @return ApplicationGroupeService
		*/
		public function setApplicationGroupeService($applicationGroupeService)
		public function setApplicationGroupeService(ApplicationGroupeService $applicationGroupeService) : ApplicationGroupeService
		{
		$this->applicationGroupeService = $applicationGroupeService;
		return $this->applicationGroupeService;

module/Application/src/Application/Service/Application/ApplicationService.php

+10 −10

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ class ApplicationService {
		* @param Application $application
		* @return Application
		*/
		public function create($application)
		public function create(Application $application)
		{
		$application->setActif(true);
		try {
		@@ -36,7 +36,7 @@ class ApplicationService {
		* @param Application $application
		* @return Application
		*/
		public function update($application)
		public function update(Application $application)
		{
		try {
		$this->getEntityManager()->flush($application);
		@@ -49,7 +49,7 @@ class ApplicationService {
		/**
		* @param Application $application
		*/
		public function delete($application)
		public function delete(Application $application)
		{
		try {
		$this->getEntityManager()->remove($application);
		@@ -77,7 +77,7 @@ class ApplicationService {
		* @param string $ordre
		* @return Application[]
		*/
		public function getApplications($champ = 'libelle', $ordre='ASC')
		public function getApplications(string $champ = 'libelle', string $ordre='ASC')
		{
		$qb = $this->createQueryBuilder()
		->orderBy('application.' . $champ, $ordre)
		@@ -92,7 +92,7 @@ class ApplicationService {
		* @param string $ordre
		* @return Application[]
		*/
		public function getApplicationsAsOptions($champ = 'libelle', $ordre='ASC')
		public function getApplicationsAsOptions(string $champ = 'libelle', string $ordre='ASC')
		{
		$result = $this->getApplications($champ, $ordre);
		$array = [];
		@@ -104,10 +104,10 @@ class ApplicationService {
		}

		/**
		* @param ApplicationGroupe $groupe
		* @param ApplicationGroupe\|null $groupe
		* @return Application[]
		*/
		public function getApplicationsGyGroupe($groupe)
		public function getApplicationsGyGroupe(?ApplicationGroupe $groupe)
		{
		$qb = $this->createQueryBuilder()
		->orderBy('application.libelle')
		@@ -129,9 +129,9 @@ class ApplicationService {
		* @param int $id
		* @return Application
		*/
		public function getApplication($id)
		public function getApplication(int $id)
		{
		$qb = $this->getEntityManager()->getRepository(Application::class)->createQueryBuilder('application')
		$qb = $this->createQueryBuilder()
		->andWhere('application.id = :id')
		->setParameter('id', $id)
		;
		@@ -149,7 +149,7 @@ class ApplicationService {
		* @param string paramName
		* @return Application
		*/
		public function getRequestedApplication($controller, $paramName)
		public function getRequestedApplication(AbstractActionController $controller, $paramName)
		{
		$id = $controller->params()->fromRoute($paramName);
		return $this->getApplication($id);

module/Application/src/Application/Service/Application/ApplicationServiceAwareTrait.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ Trait ApplicationServiceAwareTrait {
		/**
		* @return ApplicationService
		*/
		public function getApplicationService()
		public function getApplicationService() : ApplicationService
		{
		return $this->applicationService;
		}
		@@ -19,7 +19,7 @@ Trait ApplicationServiceAwareTrait {
		* @param ApplicationService $applicationService
		* @return ApplicationService
		*/
		public function setApplicationService($applicationService)
		public function setApplicationService(ApplicationService $applicationService) : ApplicationService
		{
		$this->applicationService = $applicationService;
		return $this->applicationService;

module/Application/src/Application/Service/ApplicationsRetirees/ApplicationsRetireesService.php

+0 −8

Original line number	Diff line number	Diff line
		@@ -5,10 +5,8 @@ namespace Application\Service\ApplicationsRetirees;
		use Application\Entity\Db\Application;
		use Application\Entity\Db\FichePoste;
		use Application\Entity\Db\FicheposteApplicationRetiree;
		use DateTime;
		use Doctrine\ORM\NonUniqueResultException;
		use Doctrine\ORM\ORMException;
		use Exception;
		use UnicaenApp\Exception\RuntimeException;
		use UnicaenApp\Service\EntityManagerAwareTrait;
		use UnicaenUtilisateur\Entity\DateTimeAwareTrait;
		@@ -72,12 +70,6 @@ class ApplicationsRetireesService {
		*/
		public function delete(FicheposteApplicationRetiree $applicationConservee)
		{
		// $date = $this->getDateTime();
		// $user = $this->getUserService()->getConnectedUser();
		//
		// $applicationConservee->setHistoDestruction($date);
		// $applicationConservee->setHistoDestructeur($user);

		try {
		$this->getEntityManager()->remove($applicationConservee);
		$this->getEntityManager()->flush($applicationConservee);