Commit 2795c1f2 authored by François Agneray's avatar François Agneray
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !44
parents 1cd55450 a4b7b531
......@@ -54,27 +54,27 @@ class CriteriaFamily implements \JsonSerializable
$this->dataset = $dataset;
}
public function getId(): int
public function getId()
{
return $this->id;
}
public function getLabel(): string
public function getLabel()
{
return $this->label;
}
public function setLabel(string $label): void
public function setLabel($label)
{
$this->label = $label;
}
public function getDisplay(): int
public function getDisplay()
{
return $this->display;
}
public function setDisplay(int $display): void
public function setDisplay($display)
{
$this->display = $display;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -19,7 +19,7 @@ namespace App\Entity;
class Group implements \JsonSerializable
{
/**
* @var integer
* @var int
*
* @Id
* @Column(type="integer", nullable=false)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -34,7 +34,7 @@ class User implements \JsonSerializable
*/
protected $group;
public function __construct($email)
public function __construct(string $email)
{
return $this->email = $email;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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