Skip to content

Commit efcd621

Browse files
cytopiacytopia
authored
Merge pull request #267 from devilbox/release-0.150
Add xhprof
2 parents 26c4fb5 + c0ee7a7 commit efcd621

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+345
-14
lines changed

‎.ansible/DOCKERFILES/Dockerfile-mods.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,13 @@ RUN set -eux \
456456

457457

458458
{% endif %}
459-
# Deactive PSR and Phalcon:
459+
# Deactivate PSR and Phalcon:
460460
# https://github.com/devilbox/docker-php-fpm/issues/201
461+
# Deactivate xhprof (might collide with Xdebug)
461462
RUN set -eux \
462463
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
463464
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
465+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
464466

465467

466468
###

‎.ansible/DOCKERFILES/Dockerfile-slim.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,9 @@ RUN set -eux \
454454
fi \
455455
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
456456
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
457+
fi \
458+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
459+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
457460
fi
458461

459462
###

‎.ansible/DOCKERFILES/Dockerfile-work.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ RUN set -eux \
213213
fi \
214214
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
215215
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
216+
fi \
217+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
218+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
216219
fi
217220

218221
###
@@ -497,6 +500,9 @@ RUN set -eux \
497500
fi \
498501
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
499502
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
503+
fi \
504+
&& if find /usr/local/lib/php/extensions/ -name xhprof.so | grep xhprof; then \
505+
echo "extension=xhprof.so" > /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini; \
500506
fi
501507
502508
###

‎.ansible/group_vars/all/mods.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ extensions_enabled:
105105
- vips
106106
- wddx
107107
- xdebug
108+
- xhprof
108109
- xlswriter
109110
- xmlreader
110111
- xmlrpc
@@ -1547,6 +1548,10 @@ extensions_available:
15471548
5.2:
15481549
type: pecl
15491550
version: 2.2.7
1551+
xhprof:
1552+
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
1553+
all:
1554+
type: pecl
15501555
xlswriter:
15511556
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
15521557
all:

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
## Unreleased
55

66

7+
## Release 0.150
8+
9+
### Added
10+
- Added `xhprof` PHP extension
11+
12+
713
## Release 0.149
814

915
### Added

‎Dockerfiles/mods/Dockerfile-5.2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,11 +810,13 @@ RUN set -eux \
810810
&& true
811811

812812

813-
# Deactive PSR and Phalcon:
813+
# Deactivate PSR and Phalcon:
814814
# https://github.com/devilbox/docker-php-fpm/issues/201
815+
# Deactivate xhprof (might collide with Xdebug)
815816
RUN set -eux \
816817
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
817818
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
819+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
818820

819821

820822
###

‎Dockerfiles/mods/Dockerfile-5.3

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,11 +983,13 @@ RUN set -eux \
983983
&& true
984984

985985

986-
# Deactive PSR and Phalcon:
986+
# Deactivate PSR and Phalcon:
987987
# https://github.com/devilbox/docker-php-fpm/issues/201
988+
# Deactivate xhprof (might collide with Xdebug)
988989
RUN set -eux \
989990
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
990991
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
992+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
991993

992994

993995
###

‎Dockerfiles/mods/Dockerfile-5.4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,11 +994,13 @@ RUN set -eux \
994994
&& true
995995

996996

997-
# Deactive PSR and Phalcon:
997+
# Deactivate PSR and Phalcon:
998998
# https://github.com/devilbox/docker-php-fpm/issues/201
999+
# Deactivate xhprof (might collide with Xdebug)
9991000
RUN set -eux \
10001001
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10011002
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1003+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10021004

10031005

10041006
###

‎Dockerfiles/mods/Dockerfile-5.5

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,11 +1047,13 @@ RUN set -eux \
10471047
&& true
10481048

10491049

1050-
# Deactive PSR and Phalcon:
1050+
# Deactivate PSR and Phalcon:
10511051
# https://github.com/devilbox/docker-php-fpm/issues/201
1052+
# Deactivate xhprof (might collide with Xdebug)
10521053
RUN set -eux \
10531054
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10541055
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1056+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10551057

10561058

10571059
###

‎Dockerfiles/mods/Dockerfile-5.6

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,11 +1065,13 @@ RUN set -eux \
10651065
&& true
10661066

10671067

1068-
# Deactive PSR and Phalcon:
1068+
# Deactivate PSR and Phalcon:
10691069
# https://github.com/devilbox/docker-php-fpm/issues/201
1070+
# Deactivate xhprof (might collide with Xdebug)
10701071
RUN set -eux \
10711072
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
10721073
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1074+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-xhprof.ini || true \
10731075

10741076

10751077
###

0 commit comments

Comments
 (0)