Commit 5baac858 authored by Tifenn Guillas's avatar Tifenn Guillas
Browse files

Fix conflict with getAttributes() returned type

parent 794c2a8c
...@@ -34,6 +34,11 @@ services: ...@@ -34,6 +34,11 @@ services:
- ./conf-dev/obs_cat.sql:/sql/obs_cat.sql - ./conf-dev/obs_cat.sql:/sql/obs_cat.sql
- ./conf-dev/observations_info.sql:/sql/observations_info.sql - ./conf-dev/observations_info.sql:/sql/observations_info.sql
- ./conf-dev/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh - ./conf-dev/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
adminer:
image: adminer
ports:
- 8083:8080
volumes: volumes:
pgdata: pgdata:
\ No newline at end of file
...@@ -12,7 +12,7 @@ declare(strict_types=1); ...@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace App\Entity; namespace App\Entity;
use Doctrine\Common\Collections\ArrayCollection; // use Doctrine\Common\Collections\Pers;
/** /**
* @Entity * @Entity
...@@ -218,7 +218,7 @@ class Dataset implements \JsonSerializable ...@@ -218,7 +218,7 @@ class Dataset implements \JsonSerializable
$this->datasetFamily = $datasetFamily; $this->datasetFamily = $datasetFamily;
} }
public function getAttributes(): ArrayCollection public function getAttributes()
{ {
return $this->attributes; return $this->attributes;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment