disable serverspec for php 8

webdevops · Aug 18, 2020 · ddee31f · ddee31f
1 parent 4243d35
commit ddee31f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 0 deletions.
diff --git a/tests/serverspec/spec/docker/php-apache-dev_spec.rb b/tests/serverspec/spec/docker/php-apache-dev_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::development'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::public'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::development'
         include_examples 'collection::php-fpm7'
@@ -26,6 +27,7 @@
 
     if ($testConfiguration[:php] == 5)
         include_examples 'collection::php-fpm5::webserver-test::development'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php-fpm7::webserver-test::development'
     end

diff --git a/tests/serverspec/spec/docker/php-apache_spec.rb b/tests/serverspec/spec/docker/php-apache_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::production'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::local-only'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::production'
         include_examples 'collection::php-fpm7'
@@ -25,6 +26,7 @@
 
     if ($testConfiguration[:php] == 5)
         include_examples 'collection::php-fpm5::webserver-test::production'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php-fpm7::webserver-test::production'
     end

diff --git a/tests/serverspec/spec/docker/php-dev_spec.rb b/tests/serverspec/spec/docker/php-dev_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::development'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::public'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::development'
         include_examples 'collection::php-fpm7'

diff --git a/tests/serverspec/spec/docker/php-nginx-dev_spec.rb b/tests/serverspec/spec/docker/php-nginx-dev_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::development'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::public'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::development'
         include_examples 'collection::php-fpm7'
@@ -26,6 +27,7 @@
 
     if ($testConfiguration[:php] == 5)
         include_examples 'collection::php-fpm5::webserver-test::development'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php-fpm7::webserver-test::development'
     end

diff --git a/tests/serverspec/spec/docker/php-nginx_spec.rb b/tests/serverspec/spec/docker/php-nginx_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::production'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::local-only'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::production'
         include_examples 'collection::php-fpm7'
@@ -25,6 +26,7 @@
 
     if ($testConfiguration[:php] == 5)
         include_examples 'collection::php-fpm5::webserver-test::production'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php-fpm7::webserver-test::production'
     end

diff --git a/tests/serverspec/spec/docker/php-official_spec.rb b/tests/serverspec/spec/docker/php-official_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::production'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::public'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::production'
         include_examples 'collection::php-fpm7'

diff --git a/tests/serverspec/spec/docker/php_spec.rb b/tests/serverspec/spec/docker/php_spec.rb
@@ -15,6 +15,7 @@
         include_examples 'collection::php5::production'
         include_examples 'collection::php-fpm5'
         include_examples 'collection::php-fpm5::public'
+    elsif ($testConfiguration[:php] == 8)
     else
         include_examples 'collection::php7::production'
         include_examples 'collection::php-fpm7'

diff --git a/tests/serverspec/spec/spec_config.rb b/tests/serverspec/spec/spec_config.rb
@@ -62,6 +62,9 @@
     $testConfiguration[:php] = 7
 end
 
+if ((ENV['PHP_VERSION']).match('8.0'))
+    $testConfiguration[:php] = 8
+end
 
 if ENV['PHP_OFFICIAL'] and ENV['PHP_OFFICIAL'] == "1"
     $testConfiguration[:phpOfficialImage] = true