From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Mar 2025 15:14:29 +0000 (+0000)
Subject: Don't pin dependencies for mediawiki 1.43
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/1e2b28b07c9d6b435d2e7acfdce5ec86508019fe

Don't pin dependencies for mediawiki 1.43
---

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 096484a99..6d8a5443e 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -96,6 +96,7 @@ action :create do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     mode "664"
+    variables :version => new_resource.version
   end
 
   execute "#{mediawiki_directory}/composer.json" do
diff --git a/cookbooks/mediawiki/templates/default/composer.local.json.erb b/cookbooks/mediawiki/templates/default/composer.local.json.erb
index 338a0de9d..37382c5f6 100644
--- a/cookbooks/mediawiki/templates/default/composer.local.json.erb
+++ b/cookbooks/mediawiki/templates/default/composer.local.json.erb
@@ -8,6 +8,7 @@
     }
   },
   "require": {
+<% if @version.to_f < 1.43 -%>
     "guzzlehttp/psr7": "2.4.5",
     "data-values/common": "1.0.0",
     "data-values/data-values": "3.0.0",
@@ -16,5 +17,6 @@
     "data-values/number": "0.11.1",
     "data-values/serialization": "1.2.4",
     "data-values/time": "1.0.4"
+<% end -%>
   }
 }