Merge branch 'develop' into '7-add-dependency-check'

Sync 7-add-dependency-check with develop

See merge request !26

[skip ci]

php-lint/php-lint

@@ -51,8 +51,8 @@ for dir in "${LINT_DIRS[@]}"; do
     echo "Scanning directory ${dir} for extension ${ext}"
 
     # Scan current dir and ext and lint them
-    for f in $(find "${dir}" -type f -name "*${ext}"); do
-      OUTPUT=$(php -l $f 2>&1)
+    find "${dir}" -type f -name "*${ext}" -print0 | while IFS= read -r -d '' f; do
+      OUTPUT=$(php -l "$f" 2>&1)
       rc=$?
 
       if [[ $rc != 0 ]]; then # Non-zero exit code, print error and exit

php-unit-test/7.1/Dockerfile

@@ -12,9 +12,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
 
-RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
+RUN apk add --no-cache bash nodejs nodejs-npm libmcrypt-dev $PHPIZE_DEPS \
+    && pecl install xdebug redis \
+    && docker-php-ext-enable xdebug redis \
+    && docker-php-ext-install mcrypt \
     && apk del --no-cache $PHPIZE_DEPS
 RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
   && chmod 755 /usr/local/bin/composer

php-unit-test/7.2/Dockerfile

@@ -13,8 +13,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
 
 RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
+    && pecl install xdebug redis \
+    && docker-php-ext-enable xdebug redis \
     && apk del --no-cache $PHPIZE_DEPS
 RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
   && chmod 755 /usr/local/bin/composer