diff --git a/Dockerfile b/Dockerfile index 4ec7493..55d4576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ RUN chown -R www-data:www-data /var/www USER www-data -RUN cd /var/www +RUN cd /var/www && \ + composer install WORKDIR /var/www/ ENTRYPOINT ["bash", "./docker/docker.sh"] diff --git a/docker/docker.sh b/docker/docker.sh index 80f4c13..98d1d34 100644 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -1,4 +1,3 @@ -composer install php bin/console doctrine:database:create php bin/console d:m:m --no-interaction php bin/console cache:clear diff --git a/src/Command/AddRankCommand.php b/src/Command/AddRankCommand.php index 5146ff0..4bfeadb 100644 --- a/src/Command/AddRankCommand.php +++ b/src/Command/AddRankCommand.php @@ -44,7 +44,7 @@ class AddRankCommand extends Command /** * @var GroupRepository $groupRepository */ - $groupRepository = $this->entityManager->getRepository("App:Group"); + $groupRepository = $this->entityManager->getRepository(Group::class); if ($groupid && null === $groupRepository->find($groupid)) { $groupid = ''; @@ -64,7 +64,7 @@ class AddRankCommand extends Command ); } global $groupRepository; - if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { + if (null === $this->entityManager->getRepository(Group::class)->find($answer)) { throw new \RuntimeException( 'No group find for this id' ); diff --git a/src/Command/AddUserCommand.php b/src/Command/AddUserCommand.php index 86f2c0a..2c2c72f 100644 --- a/src/Command/AddUserCommand.php +++ b/src/Command/AddUserCommand.php @@ -3,6 +3,7 @@ namespace App\Command; use App\Entity\User; +use App\Entity\Group; use Doctrine\ORM\Query; use App\Repository\GroupRepository; use Doctrine\ORM\EntityManagerInterface; @@ -103,7 +104,7 @@ class AddUserCommand extends Command /** * @var GroupRepository $groupRepository */ - $groupRepository = $this->entityManager->getRepository("App:Group"); + $groupRepository = $this->entityManager->getRepository(Group::class); if ($groupid && null === $groupRepository->find($groupid)) { $groupid = ''; @@ -123,7 +124,7 @@ class AddUserCommand extends Command ); } global $groupRepository; - if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { + if (null === $this->entityManager->getRepository(Group::class)->find($answer)) { throw new \RuntimeException( 'No group find for this id' ); diff --git a/visionversion.json b/visionversion.json index a7d4f79..4f8c0f3 100644 --- a/visionversion.json +++ b/visionversion.json @@ -1,3 +1,3 @@ { - "version": "0.2.11" + "version": "0.2.12" }