Merge pull request #926 from oat-sa/feature/adf-494/improve-depends-o…

…n-property-collection-setter Feature/ADF-494/Improve depends on property collection getter
oat-sa · Oct 8, 2021 · 9cb677b · 9cb677b
2 parents ec8f285 + a7208a2
commit 9cb677b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/core/kernel/classes/class.Property.php b/core/kernel/classes/class.Property.php
@@ -118,7 +118,6 @@ public function __construct($uri, $debug = '')
 
         $this->lgDependent = null;
         $this->multiple = null;
-        $this->dependsOnPropertyCollection = new DependsOnPropertyCollection();
     }
 
     /**
@@ -228,22 +227,24 @@ public function setRange(core_kernel_classes_Class $class)
         return (bool) $returnValue;
     }
 
-    /**
-     * @TODO Improve getter
-     */
     public function getDependsOnPropertyCollection(): DependsOnPropertyCollection
     {
-        $dependsOnProperty = $this->getProperty(GenerisRdf::PROPERTY_DEPENDS_ON_PROPERTY);
-        $dependsOnPropertyValues = $this->getPropertyValues($dependsOnProperty);
-
-        foreach ($dependsOnPropertyValues as $dependsOnPropertyValue) {
-            if ($dependsOnPropertyValue !== GenerisRdf::PROPERTY_DEPENDS_ON_PROPERTY) {
-                $this->dependsOnPropertyCollection->append(
-                    $this->getProperty($dependsOnPropertyValue)
-                );
+        if (!isset($this->dependsOnPropertyCollection)) {
+            $dependsOnProperty = $this->getProperty(GenerisRdf::PROPERTY_DEPENDS_ON_PROPERTY);
+            $dependsOnPropertyValues = $this->getPropertyValues($dependsOnProperty);
+            $this->dependsOnPropertyCollection = new DependsOnPropertyCollection();
+
+            foreach ($dependsOnPropertyValues as $dependsOnPropertyValue) {
+                if ($dependsOnPropertyValue !== GenerisRdf::PROPERTY_DEPENDS_ON_PROPERTY) {
+                    $this->dependsOnPropertyCollection->append(
+                        $this->getProperty($dependsOnPropertyValue)
+                    );
+                }
             }
         }
 
+        $this->dependsOnPropertyCollection->rewind();
+
         return $this->dependsOnPropertyCollection;
     }
 

diff --git a/core/resource/DependsOnPropertyCollection.php b/core/resource/DependsOnPropertyCollection.php
@@ -45,6 +45,11 @@ static function (core_kernel_classes_Property $property) {
         );
     }
 
+    public function isEmpty(): bool
+    {
+        return $this->count() === 0;
+    }
+
     private function areArraysEqual(array $array1, array $array2): bool
     {
         return empty(array_diff($array1, $array2)) && empty(array_diff($array2, $array1));

diff --git a/test/unit/core/resource/DependsOnPropertyCollectionTest.php b/test/unit/core/resource/DependsOnPropertyCollectionTest.php
@@ -80,4 +80,12 @@ public function testGetPropertyUris(): void
         $this->sut->append($secondProperty);
         $this->assertEquals(['firstProperty', 'secondProperty'], $this->sut->getPropertyUris());
     }
+
+    public function testIsEmpty(): void
+    {
+        $this->assertTrue($this->sut->isEmpty());
+
+        $this->sut->append('value');
+        $this->assertFalse($this->sut->isEmpty());
+    }
 }