Skip to content

Commit 3180f58

Browse files
authored
test: misc php 7.4 fixes (GoogleCloudPlatform#1158)
1 parent 2a9e721 commit 3180f58

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

.kokoro/docker/php74/Dockerfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,12 @@ RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
4949
--with-config-file-scan-dir=${PHP_DIR}/lib/conf.d \
5050
--with-pdo-pgsql \
5151
--with-zlib-dir \
52-
--with-freetype-dir \
5352
--enable-mbstring \
54-
--with-libxml-dir=/usr \
5553
--enable-soap \
5654
--enable-intl \
5755
--enable-calendar \
5856
--with-curl \
59-
--with-mcrypt \
6057
--with-zlib \
61-
--with-gd \
6258
--with-pgsql \
6359
--disable-rpath \
6460
--enable-inline-optimization \
@@ -73,14 +69,8 @@ RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
7369
--enable-exif \
7470
--enable-bcmath \
7571
--with-mhash \
76-
--enable-zip \
77-
--with-pcre-regex \
78-
--with-mysql \
7972
--with-pdo-mysql \
8073
--with-mysqli \
81-
--with-jpeg-dir=/usr \
82-
--with-png-dir=/usr \
83-
--enable-gd-native-ttf \
8474
--with-openssl \
8575
--with-fpm-user=www-data \
8676
--with-fpm-group=www-data \

testing/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"php": "^7.2|^7.3|7.4"
3+
"php": "^7.2|^7.3|^7.4"
44
},
55
"require-dev": {
66
"google/cloud-tools": "dev-master",

0 commit comments

Comments
 (0)