Skip to content

Commit 10c1eee

Browse files
authored
Merge pull request #837 from magikid/master
Sets PHP error level for getting extension dir
2 parents fa29b56 + a7e2de0 commit 10c1eee

35 files changed

+70
-70
lines changed

7.1/alpine3.8/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/alpine3.8/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/alpine3.8/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/alpine3.9/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/alpine3.9/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/alpine3.9/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/jessie/apache/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/jessie/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/jessie/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/jessie/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/stretch/apache/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/stretch/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/stretch/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.1/stretch/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.8/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.8/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.8/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.9/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.9/fpm/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/alpine3.9/zts/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/stretch/apache/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

7.2/stretch/cli/docker-php-ext-enable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
extDir="$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -d 'display_errors=stderr' -r 'echo ini_get("extension_dir");')"
55
cd "$extDir"
66

77
usage() {
@@ -94,7 +94,7 @@ for module in $modules; do
9494

9595
ext="$(basename "$module")"
9696
ext="${ext%.*}"
97-
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
97+
if php -d 'display_errors=stderr' -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
9898
# this isn't perfect, but it's better than nothing
9999
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100100
echo >&2

0 commit comments

Comments
 (0)