From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 May 2020 14:22:36 +0000 (+0100)
Subject: Use PHP 7.4 on Ubuntu 20.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f55c80c586ce03dcff307bd37d5422cabf2161a3

Use PHP 7.4 on Ubuntu 20.04
---

diff --git a/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb
index ecc9c7c66..0ca636813 100644
--- a/cookbooks/php/attributes/default.rb
+++ b/cookbooks/php/attributes/default.rb
@@ -1 +1,5 @@
-default[:php][:version] = "7.2"
+default[:php][:version] = if node[:lsb][:release].to_f < 20.04
+                            "7.2"
+                          else
+                            "7.4"
+                          end