[BUGFIX] Stabilize PHP installation

recipes/default.rb

@@ -103,51 +103,45 @@ execute 'apt -y update'
 package 'graphicsmagick'
 package 'apache2'
 
-if node['ubuntu_base']['php_version'] == '5.6'
-	%w(php5.6 php5.6-fpm php5.6-cli php5.6-curl php5.6-intl php5.6-gd php5.6-mcrypt php5.6-mysql php5.6-xml php5.6-json php5.6-mbstring php5.6-soap php5.6-zip php5.6-imagick).each do |name|
-		package name do
-			action :install
-		end
-	end
-elsif node['ubuntu_base']['php_version'] == '7.0'
-	%w(php7.0 php7.0-fpm php7.0-cli php7.0-curl php7.0-intl php7.0-gd php7.0-mcrypt php7.0-mysql php7.0-xml php7.0-json php7.0-mbstring php7.0-soap php7.0-zip php7.0-imagick).each do |name|
+if node['ubuntu_base']['php_version'] == '7.0'
+	%w(php7.0-fpm php7.0-cli php7.0-curl php7.0-intl php7.0-gd php7.0-mcrypt php7.0-mysql php7.0-xml php7.0-json php7.0-mbstring php7.0-soap php7.0-zip php7.0-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 elsif node['ubuntu_base']['php_version'] == '7.1'
-	%w(php7.1 php7.1-fpm php7.1-cli php7.1-curl php7.1-intl php7.1-gd php7.1-mcrypt php7.1-mysql php7.1-xml php7.1-json php7.1-mbstring php7.1-soap php7.1-zip php7.1-imagick).each do |name|
+	%w(php7.1-fpm php7.1-cli php7.1-curl php7.1-intl php7.1-gd php7.1-mcrypt php7.1-mysql php7.1-xml php7.1-json php7.1-mbstring php7.1-soap php7.1-zip php7.1-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 elsif node['ubuntu_base']['php_version'] == '7.2'
-	%w(php7.2 php7.2-fpm php7.2-cli php7.2-curl php7.2-intl php7.2-gd php7.2-mysql php7.2-xml php7.2-json php7.2-mbstring php7.2-soap php7.2-zip php7.2-imagick).each do |name|
+	%w(php7.2-fpm php7.2-cli php7.2-curl php7.2-intl php7.2-gd php7.2-mysql php7.2-xml php7.2-json php7.2-mbstring php7.2-soap php7.2-zip php7.2-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 elsif node['ubuntu_base']['php_version'] == '7.3'
-	%w(php7.3 php7.3-fpm php7.3-cli php7.3-curl php7.3-intl php7.3-gd php7.3-mysql php7.3-xml php7.3-json php7.3-mbstring php7.3-soap php7.3-zip php7.3-imagick).each do |name|
+	%w(php7.3-fpm php7.3-cli php7.3-curl php7.3-intl php7.3-gd php7.3-mysql php7.3-xml php7.3-json php7.3-mbstring php7.3-soap php7.3-zip php7.3-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 elsif node['ubuntu_base']['php_version'] == '7.4'
-	%w(php7.4 php7.4-fpm php7.4-cli php7.4-curl php7.4-intl php7.4-gd php7.4-mysql php7.4-xml php7.4-json php7.4-mbstring php7.4-soap php7.4-zip php7.4-imagick).each do |name|
+	%w(php7.4-fpm php7.4-cli php7.4-curl php7.4-intl php7.4-gd php7.4-mysql php7.4-xml php7.4-json php7.4-mbstring php7.4-soap php7.4-zip php7.4-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 elsif node['ubuntu_base']['php_version'] == '8.1'
-	%w(php8.1 php8.1-fpm php8.1-cli php8.1-curl php8.1-intl php8.1-gd php8.1-mysql php8.1-xml php8.1-json php8.1-mbstring php8.1-soap php8.1-zip php8.1-imagick).each do |name|
+	%w(php8.1-fpm php8.1-cli php8.1-curl php8.1-intl php8.1-gd php8.1-mysql php8.1-xml php8.1-mbstring php8.1-soap php8.1-zip php8.1-imagick).each do |name|
 		package name do
 			action :install
 		end
 	end
 else
 	# no mcrypt anymore
-	%w(php php-fpm php-cli php-curl php-intl php-gd php-mysql php-xml php-json php-mbstring php-soap php-zip php-imagick).each do |name|
+	%w(php8.2-fpm php8.2-cli php8.2-curl php8.2-intl php8.2-gd php8.2-mysql php8.2-xml php8.2-mbstring php8.2-soap php8.2-zip php8.2-imagick).each do |name|
 		package name do
 			action :install
 		end