Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
anis
anis-server
Commits
5baac858
Commit
5baac858
authored
Dec 20, 2019
by
Tifenn Guillas
Browse files
Fix conflict with getAttributes() returned type
parent
794c2a8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
docker-compose.yml
View file @
5baac858
...
...
@@ -34,6 +34,11 @@ services:
-
./conf-dev/obs_cat.sql:/sql/obs_cat.sql
-
./conf-dev/observations_info.sql:/sql/observations_info.sql
-
./conf-dev/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
adminer
:
image
:
adminer
ports
:
-
8083:8080
volumes
:
pgdata
:
\ No newline at end of file
src/Entity/Dataset.php
View file @
5baac858
...
...
@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace
App\Entity
;
use
Doctrine\Common\Collections\
ArrayCollection
;
//
use Doctrine\Common\Collections\
Pers
;
/**
* @Entity
...
...
@@ -218,7 +218,7 @@ class Dataset implements \JsonSerializable
$this
->
datasetFamily
=
$datasetFamily
;
}
public
function
getAttributes
()
:
ArrayCollection
public
function
getAttributes
()
{
return
$this
->
attributes
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment