AttributeListAction => done

src/Entity/Attribute.php

@@ -314,7 +314,7 @@ class Attribute implements \JsonSerializable
         $this->formLabel = $formLabel;
     }
 
-    public function getDescription(): string
+    public function getDescription()
     {
         return $this->description;
     }
@@ -344,7 +344,7 @@ class Attribute implements \JsonSerializable
         return $this->criteriaDisplay;
     }
 
-    public function getSearchFlag(): string
+    public function getSearchFlag()
     {
         return $this->searchFlag;
     }
@@ -354,7 +354,7 @@ class Attribute implements \JsonSerializable
         $this->searchFlag = $searchFlag;
     }
 
-    public function getSearchType(): string
+    public function getSearchType()
     {
         return $this->searchType;
     }
@@ -364,7 +364,7 @@ class Attribute implements \JsonSerializable
         $this->searchType = $searchType;
     }
 
-    public function getOperator(): string
+    public function getOperator()
     {
         return $this->operator;
     }
@@ -384,7 +384,7 @@ class Attribute implements \JsonSerializable
         $this->type = $type;
     }
 
-    public function getMin(): string
+    public function getMin()
     {
         return $this->min;
     }
@@ -394,7 +394,7 @@ class Attribute implements \JsonSerializable
         $this->min = $min;
     }
 
-    public function getMax(): string
+    public function getMax()
     {
         return $this->max;
     }
@@ -404,7 +404,7 @@ class Attribute implements \JsonSerializable
         $this->max = $max;
     }
 
-    public function getPlaceholderMin(): string
+    public function getPlaceholderMin()
     {
         return $this->placeholderMin;
     }
@@ -414,7 +414,7 @@ class Attribute implements \JsonSerializable
         $this->placeholderMin = $placeholderMin;
     }
 
-    public function getPlaceholderMax(): string
+    public function getPlaceholderMax()
     {
         return $this->placeholderMax;
     }
@@ -424,7 +424,7 @@ class Attribute implements \JsonSerializable
         $this->placeholderMax = $placeholderMax;
     }
 
-    public function getUriAction(): string
+    public function getUriAction()
     {
         return $this->uriAction;
     }
@@ -434,7 +434,7 @@ class Attribute implements \JsonSerializable
         $this->uriAction = $uriAction;
     }
 
-    public function getRenderer(): string
+    public function getRenderer()
     {
         return $this->renderer;
     }
@@ -454,7 +454,7 @@ class Attribute implements \JsonSerializable
         $this->displayDetail = $displayDetail;
     }
 
-    public function getVoUtype(): string
+    public function getVoUtype()
     {
         return $this->voUtype;
     }
@@ -464,7 +464,7 @@ class Attribute implements \JsonSerializable
         $this->voUtype = $voUtype;
     }
 
-    public function getVoUcd(): string
+    public function getVoUcd()
     {
         return $this->voUcd;
     }
@@ -474,7 +474,7 @@ class Attribute implements \JsonSerializable
         $this->voUcd = $voUcd;
     }
 
-    public function getVoUnit(): string
+    public function getVoUnit()
     {
         return $this->voUnit;
     }
@@ -484,7 +484,7 @@ class Attribute implements \JsonSerializable
         $this->voUnit = $voUnit;
     }
 
-    public function getVoDescription(): string
+    public function getVoDescription()
     {
         return $this->voDescription;
     }
@@ -494,7 +494,7 @@ class Attribute implements \JsonSerializable
         $this->voDescription = $voDescription;
     }
 
-    public function getVoDatatype(): string
+    public function getVoDatatype()
     {
         return $this->voDatatype;
     }
@@ -504,7 +504,7 @@ class Attribute implements \JsonSerializable
         $this->voDatatype = $voDatatype;
     }
 
-    public function getVoSize(): int
+    public function getVoSize()
     {
         return $this->voSize;
     }
@@ -524,7 +524,7 @@ class Attribute implements \JsonSerializable
         $this->selected = $selected;
     }
 
-    public function getOrderBy(): bool
+    public function getOrderBy()
     {
         return $this->orderBy;
     }
@@ -544,7 +544,7 @@ class Attribute implements \JsonSerializable
         $this->orderDisplay = $orderDisplay;
     }
 
-    public function getDetail(): bool
+    public function getDetail()
     {
         return $this->detail;
     }
@@ -554,7 +554,7 @@ class Attribute implements \JsonSerializable
         $this->detail = $detail;
     }
 
-    public function getRendererDetail(): string
+    public function getRendererDetail()
     {
         return $this->rendererDetail;
     }
@@ -564,7 +564,7 @@ class Attribute implements \JsonSerializable
         $this->rendererDetail = $rendererDetail;
     }
 
-    public function getOptions(): string
+    public function getOptions()
     {
         return $this->options;
     }
@@ -574,7 +574,7 @@ class Attribute implements \JsonSerializable
         $this->options = $options;
     }
 
-    public function getCriteriaFamily(): CriteriaFamily
+    public function getCriteriaFamily()
     {
         return $this->criteriaFamily;
     }
@@ -584,7 +584,7 @@ class Attribute implements \JsonSerializable
         $this->criteriaFamily = $criteriaFamily;
     }
 
-    public function getOutputCategory(): OutputCategory
+    public function getOutputCategory()
     {
         return $this->outputCategory;
     }

tests/Action/AttributeListActionTest.php

@@ -109,7 +109,9 @@ final class AttributeListActionTest extends TestCase
 
     private function addDatasetFamily(): DatasetFamily
     {
-        $family = new DatasetFamily();
+        $instance = $this->addInstance();
+
+        $family = new DatasetFamily($instance);
         $family->setLabel('Default dataset');
         $family->setDisplay(10);
         $this->entityManager->persist($family);
@@ -120,7 +122,6 @@ final class AttributeListActionTest extends TestCase
     private function addADataset(): Dataset
     {
         $project = $this->addProject();
-        $instance = $this->addInstance();
         $family = $this->addDatasetFamily();
 
         $dataset = new Dataset('obs_cat');
@@ -133,7 +134,6 @@ final class AttributeListActionTest extends TestCase
         $dataset->setDataPath('/mnt/obs_cat');
         $dataset->setSelectableRow(false);
         $dataset->setProject($project);
-        $dataset->setInstance($instance);
         $dataset->setDatasetFamily($family);
         $this->entityManager->persist($dataset);
         $this->entityManager->flush();