Component: reset resolutions to fix #42480

srsolutionsag · Dec 19, 2024 · a3777ff · a3777ff
1 parent bdd49f1
commit a3777ff
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/cli/build_bootstrap.php b/cli/build_bootstrap.php
@@ -91,8 +91,11 @@
     }
 
     echo "Resolving Dependency using {$resolution_file}...\n";
-    $disambiguation = require_once($resolution_file);
+    $disambiguation = require($resolution_file);
 
+    foreach ($component_info as $ci) {
+        $ci->resetResolutions();
+    }
     $component_info = $resolver->resolveDependencies($disambiguation, ...$component_info);
 
     echo "Writing bootstrap to artifacts/bootstrap_$name.php\n";

diff --git a/components/ILIAS/Component/src/Dependencies/Define.php b/components/ILIAS/Component/src/Dependencies/Define.php
@@ -36,4 +36,8 @@ public function getName(): string
     {
         return (string) $this->name;
     }
+
+    public function resetResolutions(): void
+    {
+    }
 }
diff --git a/components/ILIAS/Component/src/Dependencies/In.php b/components/ILIAS/Component/src/Dependencies/In.php
@@ -75,4 +75,9 @@ public function getResolvedBy(): array
     {
         return $this->resolved_by;
     }
+
+    public function resetResolutions(): void
+    {
+        $this->resolved_by = [];
+    }
 }
diff --git a/components/ILIAS/Component/src/Dependencies/OfComponent.php b/components/ILIAS/Component/src/Dependencies/OfComponent.php
@@ -85,6 +85,15 @@ public function getOutDependenciesOf(OutType $type): \Iterator
         }
     }
 
+    public function resetResolutions(): void
+    {
+        foreach ($this->dependencies as $d) {
+            foreach ($d as $o) {
+                $o->resetResolutions();
+            }
+        }
+    }
+
     // ArrayAccess
 
     public function offsetExists($dependency_description): bool

diff --git a/components/ILIAS/Component/src/Dependencies/Out.php b/components/ILIAS/Component/src/Dependencies/Out.php
@@ -96,4 +96,9 @@ public function addResolves(In $in): void
     {
         $this->resolves[] = $in;
     }
+
+    public function resetResolutions(): void
+    {
+        $this->resolves = [];
+    }
 }
diff --git a/composer.json b/composer.json
@@ -15,8 +15,7 @@
 	},
 	"scripts": {
 		"post-autoload-dump": [
-			"@php cli/build_bootstrap.php components/ILIAS/Setup/resources/dependency_resolution.php setup",
-			"@php cli/build_bootstrap.php components/ILIAS/Init/resources/dependency_resolution.php default",
+			"@php cli/build_bootstrap.php components/ILIAS/Setup/resources/dependency_resolution.php setup components/ILIAS/Init/resources/dependency_resolution.php default",
 			"@php cli/setup.php build --yes"
 		],
 		"pre-install-cmd": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,8 @@ public function getName(): string @@
         {
             return (string) $this->name;
         }
+        public function resetResolutions(): void
+        {
+        }
     }