Merge pull request #191 from devilbox/release-0.123

Release 0.123

.github/workflows/nightly.yml

@@ -40,7 +40,7 @@ jobs:
           - '8.1'
         refs:
           - 'master'
-          - '0.122'
+          - '0.123'
     steps:
 
       # ------------------------------------------------------------

CHANGELOG.md

@@ -4,6 +4,21 @@
 ## Unreleased
 
 
+## Release 0.123
+
+#### Fixed
+- Fixex `redis` module compilation for PHP 8.1
+- Fixed PHP Xdebug v3 defaults to:
+  ```ini
+  xdebug.mode               = Off
+  xdebug.start_with_request = default
+  xdebug.client_port        = 9000
+  ```
+
+#### Changed
+- Removed `pdo_dblib` from PHP 8.1 due to errors
+
+
 ## Release 0.122
 
 #### Added

Dockerfiles/base/data/php-ini.d/php-7.2.ini

@@ -43,7 +43,6 @@ html_errors             = Off
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/base/data/php-ini.d/php-7.3.ini

@@ -43,7 +43,6 @@ html_errors             = Off
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/base/data/php-ini.d/php-7.4.ini

@@ -43,7 +43,6 @@ html_errors             = Off
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/base/data/php-ini.d/php-8.0.ini

@@ -43,7 +43,6 @@ html_errors             = Off
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/base/data/php-ini.d/php-8.1.ini

@@ -43,7 +43,6 @@ html_errors             = Off
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/mods/Dockerfile-8.1

@@ -11,7 +11,6 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
-		freetds-dev \
 		libaio-dev \
 		libbz2-dev \
 		libc-client-dev \
@@ -329,16 +328,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: pdo_dblib --------------------
-RUN set -eux \
-	# Generic pre-command
-	&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
-	&& true
-
-
 # -------------------- Installing PHP Extension: pdo_firebird --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -421,7 +410,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: redis --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         GIT extension
 	&& git clone https://github.com/phpredis/phpredis /tmp/redis \
 	&& cd /tmp/redis \
@@ -437,6 +426,8 @@ if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
 fi; \
 phpize \
 && ./configure --enable-redis ${REDIS_ARGS} \
+&& sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' library.c \
+&& sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' redis_array_impl.c \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
  \
@@ -661,7 +652,6 @@ RUN set -eux \
 	libmemcachedutil2 \
 	libpng16-16 \
 	libpq5 \
-	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
 	libwebp6 \
@@ -788,8 +778,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^pcre$' \
 	&& php -m | grep -oiE '^pdo$' \
 	&& php-fpm -m | grep -oiE '^pdo$' \
-	&& php -m | grep -oiE '^pdo_dblib$' \
-	&& php-fpm -m | grep -oiE '^pdo_dblib$' \
 	&& php -m | grep -oiE '^pdo_firebird$' \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \

Dockerfiles/work/data/php-ini.d/php-7.2.ini

@@ -43,7 +43,6 @@ html_errors             = On
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/work/data/php-ini.d/php-7.3.ini

@@ -43,7 +43,6 @@ html_errors             = On
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/work/data/php-ini.d/php-7.4.ini

@@ -43,7 +43,6 @@ html_errors             = On
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/work/data/php-ini.d/php-8.0.ini

@@ -43,7 +43,6 @@ html_errors             = On
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

Dockerfiles/work/data/php-ini.d/php-8.1.ini

@@ -43,7 +43,6 @@ html_errors             = On
 
 
 ; Xdebug settings
-xdebug.default_enable   = Off
-xdebug.profiler_enable  = Off
-xdebug.remote_enable    = Off
-xdebug.remote_autostart = Off
+xdebug.mode               = Off
+xdebug.start_with_request = default
+xdebug.client_port        = 9000

README.md

@@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>8.1</th>
    <td id="81-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
   </tr>
  </tbody>
 </table>
@@ -1179,7 +1179,10 @@ $ docker run -d \
 ```shell
 # Create config directory to be mounted with dummy configuration
 $ mkdir config
+# Xdebug 2
 $ echo "xdebug.enable = 1" > config/xdebug.ini
+# Xdebug 3
+$ echo "xdebug.mode = debug" > config/xdebug.ini
 
 # Run container and mount it
 $ docker run -d \

build/ansible/CONFIGURATIONS/php.ini.j2

@@ -50,7 +50,13 @@ html_errors             = {{ item.cfg[item.key].html_errors  | default(item.cfg[
 
 
 ; Xdebug settings
-xdebug.default_enable   = {{ item.cfg[item.key].xdebug_default_enable   | default(item.cfg[item.alt].xdebug_default_enable) }}
-xdebug.profiler_enable  = {{ item.cfg[item.key].xdebug_profiler_enable  | default(item.cfg[item.alt].xdebug_profiler_enable) }}
-xdebug.remote_enable    = {{ item.cfg[item.key].xdebug_remote_enable    | default(item.cfg[item.alt].xdebug_remote_enable) }}
-xdebug.remote_autostart = {{ item.cfg[item.key].xdebug_remote_autostart | default(item.cfg[item.alt].xdebug_remote_autostart) }}
+{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %}
+xdebug.default_enable     = {{ item.cfg[item.key].xdebug2_default_enable   | default(item.cfg[item.alt].xdebug2_default_enable) }}
+xdebug.profiler_enable    = {{ item.cfg[item.key].xdebug2_profiler_enable  | default(item.cfg[item.alt].xdebug2_profiler_enable) }}
+xdebug.remote_enable      = {{ item.cfg[item.key].xdebug2_remote_enable    | default(item.cfg[item.alt].xdebug2_remote_enable) }}
+xdebug.remote_autostart   = {{ item.cfg[item.key].xdebug2_remote_autostart | default(item.cfg[item.alt].xdebug2_remote_autostart) }}
+{% else %}
+xdebug.mode               = {{ item.cfg[item.key].xdebug3_mode               | default(item.cfg[item.alt].xdebug3_mode) }}
+xdebug.start_with_request = {{ item.cfg[item.key].xdebug3_start_with_request | default(item.cfg[item.alt].xdebug3_start_with_request) }}
+xdebug.client_port        = {{ item.cfg[item.key].xdebug3_client_port        | default(item.cfg[item.alt].xdebug3_client_port) }}
+{% endif %}

build/ansible/group_vars/all/all-php-settings.yml

@@ -39,11 +39,15 @@ php_settings_ini:
     track_errors:               'On'
     log_errors:                 'On'
     html_errors:                'Off'
-    # Xdebug settings
-    xdebug_default_enable:     'Off'
-    xdebug_profiler_enable:    'Off'
-    xdebug_remote_enable:      'Off'
-    xdebug_remote_autostart:   'Off'
+    # Xdebug2 settings
+    xdebug2_default_enable:     'Off'
+    xdebug2_profiler_enable:    'Off'
+    xdebug2_remote_enable:      'Off'
+    xdebug2_remote_autostart:   'Off'
+    # Xdebug3 settings
+    xdebug3_mode:               'Off'
+    xdebug3_start_with_request: 'default'
+    xdebug3_client_port:        '9000'
 
   # ---- Inherits from base ----
   mods:
@@ -60,12 +64,15 @@ php_settings_ini:
     track_errors:               'On'
     log_errors:                 'On'
     html_errors:                'On'
-    # Xdebug settings
-    xdebug_default_enable:     'Off'
-    xdebug_profiler_enable:    'Off'
-    xdebug_remote_enable:      'Off'
-    xdebug_remote_autostart:   'Off'
-
+    # Xdebug2 settings
+    xdebug2_default_enable:     'Off'
+    xdebug2_profiler_enable:    'Off'
+    xdebug2_remote_enable:      'Off'
+    xdebug2_remote_autostart:   'Off'
+    # Xdebug3 settings
+    xdebug3_mode:               'Off'
+    xdebug3_start_with_request: 'default'
+    xdebug3_client_port:        '9000'
 
 # -------------------------------------------------------------------------------------------------
 # php-fpm.conf

build/ansible/group_vars/all/mods.yml

@@ -681,6 +681,7 @@ extensions_available:
   pdo:
     already_avail: "{{ php_all_versions }}"
   pdo_dblib:
+    disabled: [8.1]  # php: symbol lookup error: pdo_dblib.so: undefined symbol: dbinit
     all:
       type: builtin
       pre: ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/
@@ -850,6 +851,24 @@ extensions_available:
     5.6:
       type: pecl
       version: 4.3.0
+    8.1:
+      type: git
+      git_url: https://github.com/phpredis/phpredis
+      git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
+      command: |
+        REDIS_ARGS=""; \
+        if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
+          REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
+        fi; \
+        if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
+          REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
+        fi; \
+        phpize \
+        && ./configure --enable-redis ${REDIS_ARGS} \
+        && sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' library.c \
+        && sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' redis_array_impl.c \
+        && make -j$(getconf _NPROCESSORS_ONLN) \
+        && make install \
     all:
       type: git
       git_url: https://github.com/phpredis/phpredis