From a4038005e8a32d4be7ca3fad9fd76adfc5f6cdff Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Jun 2018 15:52:56 +0200 Subject: [PATCH] :zap: Fix relation cascade issue on question #26 --- docker-compose.yml | 10 +++++----- docker/react/Dockerfile | 3 +++ src/Entity/Question.php | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c8e0a96..59d56de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,9 +14,9 @@ services: build: ./docker/php-fpm ports: - "9001:9000" - #volumes: - # - ./symfony:/var/www/symfony:cached - # - ./logs/symfony:/var/www/symfony/var/logs:cached + volumes: + - ./symfony:/var/www/symfony:cached + - ./logs/symfony:/var/www/symfony/var/logs:cached links: - db nginx: @@ -48,6 +48,6 @@ services: - '.:/usr/src/app' - '/usr/src/app/node_modules' ports: - - '3000:3000' + - '3001:3000' environment: - - NODE_ENV=development + - NODE_ENV=development \ No newline at end of file diff --git a/docker/react/Dockerfile b/docker/react/Dockerfile index e9b1c13..5fe605a 100644 --- a/docker/react/Dockerfile +++ b/docker/react/Dockerfile @@ -3,6 +3,8 @@ FROM node:9.6.1 # set working directory RUN mkdir /usr/src/app +RUN chmod -R 755 /var/www/am-i-late/logs +USER $USER WORKDIR /usr/src/app # add `/usr/src/app/node_modules/.bin` to $PATH @@ -10,6 +12,7 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH # install and cache app dependencies COPY client/package.json /usr/src/app/package.json +#RUN chown -R $USER /usr/src/app RUN npm install --silent #RUN npm install react-scripts@1.1.1 -g --silent diff --git a/src/Entity/Question.php b/src/Entity/Question.php index cad22d4..5230e2e 100644 --- a/src/Entity/Question.php +++ b/src/Entity/Question.php @@ -39,7 +39,7 @@ class Question private $date; /** - * @ORM\OneToMany(targetEntity="App\Entity\Response", mappedBy="question") + * @ORM\OneToMany(targetEntity="App\Entity\Response", mappedBy="question", orphanRemoval=true, cascade={"persist", "remove", "merge"}) * @ORM\JoinTable(name="response") * @ApiSubresource() */ @@ -66,7 +66,7 @@ class Question return $this->id; } - public function getText(): string + public function getText(): ?string { return $this->text; }