diff --git a/.ansible/group_vars/all/mods.yml b/.ansible/group_vars/all/mods.yml index 0a7e1db1..4057a3d6 100644 --- a/.ansible/group_vars/all/mods.yml +++ b/.ansible/group_vars/all/mods.yml @@ -1549,21 +1549,9 @@ extensions_available: type: pecl version: 2.2.7 xhprof: - disabled: [5.2] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6] all: type: pecl - 5.6: - type: pecl - version: 0.9.4 - 5.5: - type: pecl - version: 0.9.4 - 5.4: - type: pecl - version: 0.9.4 - 5.3: - type: pecl - version: 0.9.4 xlswriter: disabled: [5.2, 5.3, 5.4, 5.5, 5.6] all: diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 3d5c0cc7..9d1c226e 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -640,17 +640,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: xhprof -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install xhprof-0.9.4 \ - # Enabling - && docker-php-ext-enable xhprof \ - && true - - # -------------------- Installing PHP Extension: xmlrpc -------------------- RUN set -eux \ # Installation: Generic @@ -979,8 +968,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^wddx$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ - && php -m | grep -oiE '^xhprof$' \ - && php-fpm -m | grep -oiE '^xhprof$' \ && php -m | grep -oiE '^xmlreader$' \ && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 6a7115ed..f736d150 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -651,17 +651,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: xhprof -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install xhprof-0.9.4 \ - # Enabling - && docker-php-ext-enable xhprof \ - && true - - # -------------------- Installing PHP Extension: xmlrpc -------------------- RUN set -eux \ # Installation: Generic @@ -990,8 +979,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^wddx$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ - && php -m | grep -oiE '^xhprof$' \ - && php-fpm -m | grep -oiE '^xhprof$' \ && php -m | grep -oiE '^xmlreader$' \ && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 7bf9951f..b88e8f88 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -689,17 +689,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: xhprof -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install xhprof-0.9.4 \ - # Enabling - && docker-php-ext-enable xhprof \ - && true - - # -------------------- Installing PHP Extension: xmlrpc -------------------- RUN set -eux \ # Installation: Generic @@ -1043,8 +1032,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^wddx$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ - && php -m | grep -oiE '^xhprof$' \ - && php-fpm -m | grep -oiE '^xhprof$' \ && php -m | grep -oiE '^xmlreader$' \ && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 27ba6baa..c76c6577 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -708,17 +708,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: xhprof -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install xhprof-0.9.4 \ - # Enabling - && docker-php-ext-enable xhprof \ - && true - - # -------------------- Installing PHP Extension: xmlrpc -------------------- RUN set -eux \ # Installation: Generic @@ -1061,8 +1050,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^wddx$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ - && php -m | grep -oiE '^xhprof$' \ - && php-fpm -m | grep -oiE '^xhprof$' \ && php -m | grep -oiE '^xmlreader$' \ && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ diff --git a/doc/php-modules.md b/doc/php-modules.md index 609a844d..4985ae52 100644 --- a/doc/php-modules.md +++ b/doc/php-modules.md @@ -2199,10 +2199,10 @@ The following PHP modules are available on the `mods`, `prod`, `slim` and `work` xhprof - ✓ - ✓ - ✓ - ✓ + + + + ✓ ✓ ✓ diff --git a/php_modules/xhprof/install.yml b/php_modules/xhprof/install.yml index 5431071e..1c9cafb1 100644 --- a/php_modules/xhprof/install.yml +++ b/php_modules/xhprof/install.yml @@ -7,19 +7,3 @@ all: type: pecl - -5.6: - type: pecl - version: 0.9.4 - -5.5: - type: pecl - version: 0.9.4 - -5.4: - type: pecl - version: 0.9.4 - -5.3: - type: pecl - version: 0.9.4 diff --git a/php_modules/xhprof/options.yml b/php_modules/xhprof/options.yml index 5debbe89..f2adfe88 100644 --- a/php_modules/xhprof/options.yml +++ b/php_modules/xhprof/options.yml @@ -4,7 +4,7 @@ name: xhprof # Exclude module build/installation for the following PHP versions -exclude: [5.2] +exclude: [5.2, 5.3, 5.4, 5.5, 5.6] # In order for this module to built correctly against all dependencies, # the following modules must have been built first.