Merge pull request devilbox#267 from devilbox/release-0.150

Add xhprof

.ansible/DOCKERFILES/Dockerfile-mods.j2

@@ -456,11 +456,13 @@ RUN set -eux \
 
 
 {% endif %}
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

.ansible/DOCKERFILES/Dockerfile-slim.j2

@@ -454,6 +454,9 @@ RUN set -eux \
  fi \
  && if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
  echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
+ fi \
+ && if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
+ echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
  fi
 
 ###

.ansible/DOCKERFILES/Dockerfile-work.j2

@@ -213,6 +213,9 @@ RUN set -eux \
  fi \
  && if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
  echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
+ fi \
+ && if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
+ echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
  fi
 
 ###
@@ -497,6 +500,9 @@ RUN set -eux \
  fi \
  && if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
  echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
+ fi \
+ && if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
+ echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
  fi
 
 ###

.ansible/group_vars/all/mods.yml

@@ -105,6 +105,7 @@ extensions_enabled:
  - vips
  - wddx
  - xdebug
+ - xhprof
  - xlswriter
  - xmlreader
  - xmlrpc
@@ -1547,6 +1548,10 @@ extensions_available:
  5.2:
  type: pecl
  version: 2.2.7
+ xhprof:
+ disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
+ all:
+ type: pecl
  xlswriter:
  disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
  all:

CHANGELOG.md

@@ -4,6 +4,12 @@
 ## Unreleased
 
 
+## Release 0.150
+
+### Added
+- Added `xhprof` PHP extension
+
+
 ## Release 0.149
 
 ### Added

Dockerfiles/mods/Dockerfile-5.2

@@ -810,11 +810,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-5.3

@@ -983,11 +983,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-5.4

@@ -994,11 +994,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-5.5

@@ -1047,11 +1047,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-5.6

@@ -1065,11 +1065,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-7.0

@@ -833,6 +833,17 @@ RUN set -eux \
  && true
 
 
+# -------------------- Installing PHP Extension: xhprof --------------------
+RUN set -eux \
+ # Installation: Generic
+ # Type: PECL extension
+ # Default: Pecl command
+ && pecl install xhprof \
+ # Enabling
+ && docker-php-ext-enable xhprof \
+ && true
+
+
 # -------------------- Installing PHP Extension: xlswriter --------------------
 RUN set -eux \
  # Installation: Generic
@@ -1197,6 +1208,8 @@ 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 '^xlswriter$' \
  && php-fpm -m | grep -oiE '^xlswriter$' \
  && php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-7.1

@@ -851,6 +851,17 @@ RUN set -eux \
  && true
 
 
+# -------------------- Installing PHP Extension: xhprof --------------------
+RUN set -eux \
+ # Installation: Generic
+ # Type: PECL extension
+ # Default: Pecl command
+ && pecl install xhprof \
+ # Enabling
+ && docker-php-ext-enable xhprof \
+ && true
+
+
 # -------------------- Installing PHP Extension: xlswriter --------------------
 RUN set -eux \
  # Installation: Generic
@@ -1217,6 +1228,8 @@ 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 '^xlswriter$' \
  && php-fpm -m | grep -oiE '^xlswriter$' \
  && php -m | grep -oiE '^xmlreader$' \
@@ -1234,11 +1247,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-7.2

@@ -854,6 +854,17 @@ RUN set -eux \
  && true
 
 
+# -------------------- Installing PHP Extension: xhprof --------------------
+RUN set -eux \
+ # Installation: Generic
+ # Type: PECL extension
+ # Default: Pecl command
+ && pecl install xhprof \
+ # Enabling
+ && docker-php-ext-enable xhprof \
+ && true
+
+
 # -------------------- Installing PHP Extension: xlswriter --------------------
 RUN set -eux \
  # Installation: Generic
@@ -1222,6 +1233,8 @@ 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 '^xlswriter$' \
  && php-fpm -m | grep -oiE '^xlswriter$' \
  && php -m | grep -oiE '^xmlreader$' \
@@ -1239,11 +1252,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-7.3

@@ -848,6 +848,17 @@ RUN set -eux \
  && true
 
 
+# -------------------- Installing PHP Extension: xhprof --------------------
+RUN set -eux \
+ # Installation: Generic
+ # Type: PECL extension
+ # Default: Pecl command
+ && pecl install xhprof \
+ # Enabling
+ && docker-php-ext-enable xhprof \
+ && true
+
+
 # -------------------- Installing PHP Extension: xlswriter --------------------
 RUN set -eux \
  # Installation: Generic
@@ -1214,6 +1225,8 @@ 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 '^xlswriter$' \
  && php-fpm -m | grep -oiE '^xlswriter$' \
  && php -m | grep -oiE '^xmlreader$' \
@@ -1231,11 +1244,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###

Dockerfiles/mods/Dockerfile-7.4

@@ -835,6 +835,17 @@ RUN set -eux \
  && true
 
 
+# -------------------- Installing PHP Extension: xhprof --------------------
+RUN set -eux \
+ # Installation: Generic
+ # Type: PECL extension
+ # Default: Pecl command
+ && pecl install xhprof \
+ # Enabling
+ && docker-php-ext-enable xhprof \
+ && true
+
+
 # -------------------- Installing PHP Extension: xlswriter --------------------
 RUN set -eux \
  # Installation: Generic
@@ -1197,6 +1208,8 @@ RUN set -eux \
  && php-fpm -m | grep -oiE '^vips$' \
  && 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 '^xlswriter$' \
  && php-fpm -m | grep -oiE '^xlswriter$' \
  && php -m | grep -oiE '^xmlreader$' \
@@ -1214,11 +1227,13 @@ RUN set -eux \
  && true
 
 
-# Deactive PSR and Phalcon:
+# Deactivate PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
+# Deactivate xhprof (might collide with Xdebug)
 RUN set -eux \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
  && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
+ && rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
 
 
 ###