Merge pull request #235 from moufmouf/pcovphp8

Enabling pcov again in PHP 8

Author: moufmouf

extensions/8.0/pcov

@@ -0,0 +1 @@
+../core/pcov

extensions/core/docker-install.sh

@@ -13,12 +13,13 @@ fi
 
 if [ -n "$EXTENSION" ]; then
   set +e
-  if apt-cache search --names-only "php${PHP_VERSION}-$EXTENSION" | grep "php${PHP_VERSION}-$EXTENSION"; then
+  PACKAGE_NAME=${PACKAGE_NAME:-$EXTENSION}
+  if apt-cache search --names-only "php${PHP_VERSION}-$PACKAGE_NAME" | grep "php${PHP_VERSION}-$PACKAGE_NAME"; then
     set -e
-    apt-get install -y --no-install-recommends php${PHP_VERSION}-$EXTENSION
+    apt-get install -y --no-install-recommends php${PHP_VERSION}-$PACKAGE_NAME
   else
     set -e
-    apt-get install -y --no-install-recommends php-$EXTENSION
+    apt-get install -y --no-install-recommends php-$PACKAGE_NAME
   fi
 
 fi
@@ -27,14 +28,20 @@ if [ -n "$PECL_EXTENSION" ]; then
     # if env ready?
 
     # is phpize installed?
-    if which pecl && which phpize; then
-      echo "pecl found"
-      which pecl
+    if which pickle && which phpize; then
+      echo "pickle found"
+      which pickle
     else
       apt-get install -y --no-install-recommends build-essential php-pear php${PHP_VERSION}-dev pkg-config
+      curl https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -L -o /usr/local/bin/pickle
+      chmod +x /usr/local/bin/pickle
     fi
 
-    pecl install $PECL_EXTENSION
+    if [ -n "$USE_PECL" ]; then
+      pecl install $PECL_EXTENSION
+    else
+      pickle install $PECL_EXTENSION
+    fi
     echo "extension=${PHP_EXT_NAME:-${PECL_EXTENSION}}.so" > /etc/php/${PHP_VERSION}/mods-available/${PHP_EXT_NAME:-${PECL_EXTENSION}}.ini
     # Adding this in the list of Ubuntu extensions because we use that list as a base for the modules list.
     # TODO: question: cannot we use /etc/php/mods-available instead???

extensions/core/install_all.sh

@@ -23,3 +23,4 @@ apt-get purge -y php-pear build-essential php${PHP_VERSION}-dev pkg-config
 apt-get autoremove -y
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+rm -f /usr/local/bin/pickle

extensions/core/mcrypt/install.sh

@@ -3,6 +3,7 @@
 set -e
 # Comments: MCrypt is deprecated and usage is generally discouraged. Provided here for legacy apps only.
 
+export USE_PECL=1
 export PECL_EXTENSION=mcrypt-1.0.1
 export PHP_EXT_NAME=mcrypt # name of the extension (to put in PHP_EXTENSIONS variable)
 export DEV_DEPENDENCIES="libmcrypt-dev"

extensions/core/mysqli/install.sh

@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 
 set -e
-export EXTENSION=mysql
+export EXTENSION=mysqlnd
+export PACKAGE_NAME=mysql
 
 ../docker-install.sh
+
+# Exception for this package that enables both mysqlnd and mysqli and pdo_mysql
+phpdismod mysqli
+phpdismod pdo_mysql

extensions/core/pcov/install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
-export EXTENSION=pcov
+export PECL_EXTENSION=pcov
 
 ../docker-install.sh

extensions/core/swoole/install.sh

@@ -3,4 +3,5 @@
 set -e
 export DEV_DEPENDENCIES="zlib1g-dev"
 export DEPENDENCIES="zlib1g"
+export USE_PECL=1
 PECL_EXTENSION=swoole ../docker-install.sh

utils/php_proxy.sh

@@ -5,6 +5,8 @@ sudo chown docker:docker /opt/php_env_var_cache.php
 REGENERATE=$(/usr/bin/real_php /usr/local/bin/check_php_env_var_changes.php)
 
 if [[ "$REGENERATE" != "0" ]] && [[ "$REGENERATE" != "1" ]]; then
+  >&2 echo "Unexpected PHP proxy output:"
+  >&2 echo $REGENERATE
   exit 1
 fi