Merge branch 'update-default-php' into 'master'v3.22.2

Update to PHP 7.4.8

See merge request gitlab-org/security-products/license-management!208

5 files changed, 12 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fde712f..37274ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.22.2
+
+- Update default PHP to `7.4.8` (!208)
+
 ## v3.22.1
 
 - Fix bug with loading `.bashrc`. (!206)
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b6fff4..cf65bcd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.22.1)
+    license-management (3.22.2)
       license_finder (~> 6.6.0)
 
 GEM
diff --git a/config/files/.tool-versions b/config/files/.tool-versions
index 968bd25..5da7afd 100644
--- a/config/files/.tool-versions
+++ b/config/files/.tool-versions
@@ -4,7 +4,7 @@ gradle 6.3
 java adoptopenjdk-8.0.252+9.1 adoptopenjdk-11.0.7+10.1
 maven 3.6.3
 nodejs 12.16.3 10.20.1
-php 7.4.5
+php 7.4.8
 python 3.8.2 2.7.18
 ruby 2.6.6
 rust 1.45.0
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 36c4cf3..5505daf 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.22.1'
+    VERSION = '3.22.2'
   end
 end
diff --git a/spec/fixtures/php/composer/drupal-core/setup.sh b/spec/fixtures/php/composer/drupal-core/setup.sh
index e945dd4..5c4e0cb 100644
--- a/spec/fixtures/php/composer/drupal-core/setup.sh
+++ b/spec/fixtures/php/composer/drupal-core/setup.sh
@@ -1,3 +1,7 @@
 #!/bin/bash -l
 
-composer install --no-cache --no-scripts --dev --verbose
+set -ex
+
+dpkg -i /opt/toolcache/php*.deb
+asdf reshim
+composer install --no-cache --no-scripts --dev --verbose --ignore-platform-reqs