Fix tests for refactored debian-8-php7

Disabled xdebug because it's not available for debian sury
Also readded dotdeb template macro

Author: mblaschke

docker/php-dev/debian-8-php7/Dockerfile

@@ -17,7 +17,7 @@ RUN /usr/local/bin/apt-install \
         # Install tools
         graphviz \
         # Install php development stuff
-        php7.0-xdebug \
+        # php7.0-xdebug \ # Is currently not available
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \
     && /opt/docker/bin/bootstrap.sh
 

docker/php/debian-8-php7/Dockerfile

@@ -16,7 +16,6 @@ ENV WEB_ALIAS_DOMAIN   *.vm
 
 COPY conf/ /opt/docker/
 
-# Install php environment
 RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
     && echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list \
     && echo "deb http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \
@@ -51,6 +50,10 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
         php7.0-bz2 \
         php7.0-redis \
         php7.0-memcached \
+        php7.0-zip \
+        php7.0-soap \
+        php7.0-bcmath \
+        php7.0-mbstring \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
     && /opt/docker/bin/bootstrap.sh

template/Dockerfile/images/php7-dev.jinja2

@@ -32,6 +32,16 @@ RUN /usr/local/bin/apt-install \
     {{ provision.runRoleInline('php-dev', role) }}
 {%- endmacro %}
 
+{% macro debianDotDeb(role='') -%}
+# Install development environment
+RUN /usr/local/bin/apt-install \
+        # Install tools
+        graphviz \
+        # Install php development stuff
+        php7.0-xdebug \
+    {{ provision.runRoleInline('php-dev', role) }}
+{%- endmacro %}
+
 {% macro debianSury(role='') -%}
 # Install development environment
 RUN /usr/local/bin/apt-install \

template/Dockerfile/images/php7.jinja2

@@ -63,6 +63,36 @@ RUN /usr/local/bin/apk-install \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}
 
+{% macro debianDotDeb(distribution,role='') -%}
+# Install php environment
+RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sources.list \
+    && echo "deb-src http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sources.list \
+    && wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add  - \
+    && /usr/local/bin/apt-install \
+        # Install tools
+        imagemagick \
+        graphicsmagick \
+        # Install php (cli/fpm)
+        php7.0-cli \
+        php7.0-fpm \
+        php7.0-json \
+        php7.0-intl \
+        php7.0-curl \
+        php7.0-mysql \
+        php7.0-mcrypt \
+        php7.0-gd \
+        php7.0-sqlite3 \
+        php7.0-ldap \
+        php7.0-opcache \
+        php7.0-xmlrpc \
+        php7.0-xsl \
+        php7.0-bz2 \
+        php7.0-redis \
+        php7.0-memcached \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    {{ provision.runRoleInline('php', role) }}
+{%- endmacro %}
+
 {% macro debianSury(distribution,role='') -%}
 RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
     && echo "deb https://packages.sury.org/php/ {{ distribution }} main" >> /etc/apt/sources.list \
@@ -98,6 +128,10 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
         php7.0-bz2 \
         php7.0-redis \
         php7.0-memcached \
+        php7.0-zip \
+        php7.0-soap \
+        php7.0-bcmath \
+        php7.0-mbstring \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}

test/run.sh

@@ -395,7 +395,7 @@ initEnvironment
     OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest"
 
     setEnvironmentOsFamily "debian"
-    OS_VERSION="8" runTestForTag "debian-8-php7"
+    PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7"
     OS_VERSION="testing" runTestForTag "debian-9"
 
     setEnvironmentOsFamily "alpine"
@@ -551,7 +551,7 @@ initEnvironment
     OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest"
 
     setEnvironmentOsFamily "debian"
-    OS_VERSION="8" runTestForTag "debian-8-php7"
+    PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7"
     OS_VERSION="testing" runTestForTag "debian-9"
 
     setEnvironmentOsFamily "alpine"
@@ -651,7 +651,7 @@ initEnvironment
     OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest"
 
     setEnvironmentOsFamily "debian"
-    OS_VERSION="8" runTestForTag "debian-8-php7"
+    PHP_XDEBUG=0 OS_VERSION="8" runTestForTag "debian-8-php7"
     OS_VERSION="testing" runTestForTag "debian-9"
 
     setEnvironmentOsFamily "alpine"

test/spec/shared/php/modules.rb

@@ -74,7 +74,9 @@
 
 shared_examples 'php::modules::development' do
     describe command('php -m') do
-        its(:stdout) { should contain('xdebug') }
+        if ( $testConfiguration[:phpXdebug] )
+            its(:stdout) { should contain('xdebug') }
+        end
 
         its(:exit_status) { should eq 0 }
     end
@@ -187,7 +189,10 @@
 
 shared_examples 'php-fpm::modules::development' do
     describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do
-        its(:stdout) { should contain('xdebug') }
+
+        if ( $testConfiguration[:phpXdebug] )
+            its(:stdout) { should contain('xdebug') }
+        end
 
         its(:exit_status) { should eq 0 }
     end

test/spec/spec_helper.rb

@@ -24,6 +24,11 @@
     $testConfiguration[:ansiblePath] = "/usr/local/bin"
 end
 
+$testConfiguration[:phpXdebug] = true
+
+if ENV['PHP_XDEBUG'] and ENV['PHP_XDEBUG'] == "0"
+    $testConfiguration[:phpXdebug] = false
+end
 
 def wait_retry(time, increment = 1, elapsed_time = 0, &block)
   begin