- Code coverage with Coveralls prepared.

Author: dptole

docker/entrypoint.sh

@@ -247,10 +247,6 @@ apk add curl bash vim nodejs npm mariadb mariadb-client openrc
 curl 'https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub' -o /etc/apk/keys/php-alpine.rsa.pub
 apk add php7-curl php7-dom php7-fpm php7-json php7-session php7-openssl php7-pdo_mysql php7-pdo php7-fileinfo --repository https://dl.bintray.com/php-alpine/v3.10/php-7.4
 
-# Install and enable Xdebug for code coverage with coveralls
-pecl install xdebug
-docker-php-ext-enable xdebug
-
 # Config ~/.vimrc file
 cat <<EOF -> ~/.vimrc
 set sts=2
@@ -969,6 +965,10 @@ rc-service nginx start
 rc-update add php-fpm7 default
 rc-update add nginx default
 
+# Install and enable Xdebug for code coverage with coveralls
+pecl install xdebug
+docker-php-ext-enable xdebug
+
 # Don't stop the container on server crash
 set +x
 sleep 3

docker/install-container.sh

@@ -65,6 +65,7 @@ $dockerdir/remove-container.sh
 # Install container
 sudo docker run \
   -d \
+  -e UPLOAD_COVERALLS=false \
   -e LARAVEL_HTTP_PORT=$LARAVEL_HTTP_PORT \
   -e LARAVEL_SERVER_ENV=$LARAVEL_SERVER_ENV \
   -e LARAVEL_MAXMIND_COUNTRY_LICENSE_KEY=$LARAVEL_MAXMIND_COUNTRY_LICENSE_KEY \

phpunit.xml

@@ -59,5 +59,6 @@
     </php>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-html" target="build/logs/html"/>
     </logging>
 </phpunit>

tests/run-tests.sh

@@ -11,7 +11,7 @@ CREATE_DB=true
 CLEAR_CONFIG_CACHE=true
 
 # UPLOAD_COVERALLS=<true|false>
-UPLOAD_COVERALLS=true
+UPLOAD_COVERALLS=${UPLOAD_COVERALLS-true}
 
 if [ ! -e vendor/bin/phpunit ]
 then
@@ -68,18 +68,14 @@ fi
 # Clean up
 rm -rf $localdirname/build/
 
+# Run unit and feature tests
+vendor/bin/phpunit -v
+
 if [ "$UPLOAD_COVERALLS" == "true" ]
 then
-  # Run unit and feature tests and output coverage data
-  vendor/bin/phpunit --coverage-clover "$localdirname/build/logs/clover.xml"
-
   # Run the code coverage analysis
   vendor/bin/php-coveralls -v
 
-else
-  # Run unit and feature tests and output html data
-  vendor/bin/phpunit --coverage-html "$localdirname/build/logs/html"
-
 fi
 
 # Store the error code from the previous command because