Skip to content

Commit e207e61

Browse files
smokodonsmokodon
committed
Adding PHP 8.3
1 parent acf994e commit e207e61

35 files changed

+319
-132
lines changed

‎.travis.yml

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,75 @@ language: php
33
jobs:
44
include:
55
- dist: jammy
6-
language: minimal
7-
group: dev
6+
group: stable
87
env:
98
- RELEASE=jammy
109
name: jammy
1110
php: "8.1"
1211
before_install:
1312
- sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
1413
- sudo apt-get update
15-
- sudo apt-get -y install libcurl4-openssl-dev
16-
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 libargon2-0 libargon2-0-dev php-dev libonig-dev; fi
14+
- sudo apt-get -y install libcurl4-openssl-dev php-dev libicu-dev php-pear php
15+
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 libargon2-0 php-pear libargon2-0-dev php-dev libonig-dev; fi
1716
- sudo ln -s /usr/include/x86_64-linux-gnu/curl/ /usr/local/include
1817
- command -v expect || sudo apt-get install expect
1918
- |
2019
if ! command -v phpenv; then
2120
pushd $HOME
22-
curl -L http://git.io/phpenv-installer | bash
21+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
2322
popd
2423
export PHPENV_ROOT="/home/travis/.phpenv"
2524
if [ -d "${PHPENV_ROOT}" ]; then
2625
export PATH="${PHPENV_ROOT}/bin:${PATH}"
2726
eval "$(phpenv init -)"
2827
fi
2928
fi
29+
# test
3030
- dist: focal
31-
language: __ubuntu_2004__
32-
group: dev
31+
language: minimal
32+
group: stable
3333
env:
3434
- RELEASE=focal
3535
name: focal
36-
php: "5.6"
36+
php: "7.4"
3737
before_install:
3838
- sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
3939
- sudo apt-get update
40-
- sudo apt-get -y install libcurl4-openssl-dev
41-
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 libargon2-0 libargon2-0-dev php-dev libonig-dev; fi
40+
- sudo apt-get -y install libcurl4-openssl-dev php-pear php-dev libicu-dev
41+
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 php-pear libargon2-0 libargon2-0-dev php-dev libonig-dev; fi
4242
- sudo ln -s /usr/include/x86_64-linux-gnu/curl/ /usr/local/include
4343
- command -v expect || sudo apt-get install expect
4444
- |
4545
if ! command -v phpenv; then
4646
pushd $HOME
47-
curl -L http://git.io/phpenv-installer | bash
47+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
4848
popd
4949
export PHPENV_ROOT="/home/travis/.phpenv"
5050
if [ -d "${PHPENV_ROOT}" ]; then
5151
export PATH="${PHPENV_ROOT}/bin:${PATH}"
5252
eval "$(phpenv init -)"
5353
fi
5454
fi
55-
if: env(VERSION) !~ /^7\.[23]/
5655
- dist: bionic
5756
language: minimal
58-
group: dev
57+
group: stable
5958
env:
6059
- RELEASE=bionic
6160
name: bionic
6261
php: "5.6"
6362
before_install:
63+
# remove when Bionic image is fixed
64+
- sudo rm -f /etc/apt/sources.list.d/pgdg.list
6465
- sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
6566
- sudo apt-get update
66-
- sudo apt-get -y install libcurl4-openssl-dev
67-
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 libargon2-0 libargon2-0-dev php-dev libonig-dev; fi
67+
- sudo apt-get -y install libcurl4-openssl-dev php-pear php-dev libicu-dev
68+
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install argon2 php-pear libargon2-0 libargon2-0-dev php-dev libonig-dev; fi
6869
- sudo ln -s /usr/include/x86_64-linux-gnu/curl/ /usr/local/include
6970
- command -v expect || sudo apt-get install expect
7071
- |
7172
if ! command -v phpenv; then
7273
pushd $HOME
73-
curl -L http://git.io/phpenv-installer | bash
74+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
7475
popd
7576
export PHPENV_ROOT="/home/travis/.phpenv"
7677
if [ -d "${PHPENV_ROOT}" ]; then
@@ -79,20 +80,21 @@ jobs:
7980
fi
8081
fi
8182
- dist: xenial
82-
group: edge
83+
group: stable
8384
env:
8485
- RELEASE=xenial
8586
name: xenial
8687
php: "5.6"
8788
before_install:
8889
- sudo rm -rf /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock
8990
- sudo apt-get update
90-
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install php-dev libonig-dev; fi
91+
- sudo apt-get install -y php-pear php-dev libicu-dev
92+
- if [[ $VERSION =~ ^8.* ]]; then sudo apt-get -y install php-dev php-pear libonig-dev; fi
9193
- command -v expect || sudo apt-get install expect
9294
- |
9395
if ! command -v phpenv; then
9496
pushd $HOME
95-
curl -L http://git.io/phpenv-installer | bash
97+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
9698
popd
9799
export PHPENV_ROOT="/home/travis/.phpenv"
98100
if [ -d "${PHPENV_ROOT}" ]; then
@@ -101,14 +103,6 @@ jobs:
101103
fi
102104
fi
103105
104-
- services:
105-
- docker
106-
dist: trusty
107-
env:
108-
- RELEASE=trusty
109-
name: trusty
110-
php: "5.6"
111-
if: env(VERSION) =~ /^7\.[0-3]/
112106
- arch: ppc64le
113107
dist: jammy
114108
language: minimal
@@ -122,7 +116,7 @@ jobs:
122116
- |
123117
if ! command -v phpenv; then
124118
pushd $HOME
125-
curl -L http://git.io/phpenv-installer | bash
119+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
126120
popd
127121
export PHPENV_ROOT="/home/travis/.phpenv"
128122
if [ -d "${PHPENV_ROOT}" ]; then
@@ -143,7 +137,7 @@ jobs:
143137
- |
144138
if ! command -v phpenv; then
145139
pushd $HOME
146-
curl -L http://git.io/phpenv-installer | bash
140+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
147141
popd
148142
export PHPENV_ROOT="/home/travis/.phpenv"
149143
if [ -d "${PHPENV_ROOT}" ]; then
@@ -164,7 +158,7 @@ jobs:
164158
- |
165159
if ! command -v phpenv; then
166160
pushd $HOME
167-
curl -L http://git.io/phpenv-installer | bash
161+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
168162
popd
169163
export PHPENV_ROOT="/home/travis/.phpenv"
170164
if [ -d "${PHPENV_ROOT}" ]; then
@@ -186,7 +180,7 @@ jobs:
186180
- |
187181
if ! command -v phpenv; then
188182
pushd $HOME
189-
curl -L http://git.io/phpenv-installer | bash
183+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
190184
popd
191185
export PHPENV_ROOT="/home/travis/.phpenv"
192186
if [ -d "${PHPENV_ROOT}" ]; then
@@ -207,7 +201,7 @@ jobs:
207201
- |
208202
if ! command -v phpenv; then
209203
pushd $HOME
210-
curl -L http://git.io/phpenv-installer | bash
204+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
211205
popd
212206
export PHPENV_ROOT="/home/travis/.phpenv"
213207
if [ -d "${PHPENV_ROOT}" ]; then
@@ -229,7 +223,7 @@ jobs:
229223
- |
230224
if ! command -v phpenv; then
231225
pushd $HOME
232-
curl -L http://git.io/phpenv-installer | bash
226+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
233227
popd
234228
export PHPENV_ROOT="/home/travis/.phpenv"
235229
if [ -d "${PHPENV_ROOT}" ]; then
@@ -251,7 +245,7 @@ jobs:
251245
- |
252246
if ! command -v phpenv; then
253247
pushd $HOME
254-
curl -L http://git.io/phpenv-installer | bash
248+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
255249
popd
256250
export PHPENV_ROOT="/home/travis/.phpenv"
257251
if [ -d "${PHPENV_ROOT}" ]; then
@@ -274,7 +268,7 @@ jobs:
274268
- |
275269
if ! command -v phpenv; then
276270
pushd $HOME
277-
curl -L http://git.io/phpenv-installer | bash
271+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
278272
popd
279273
export PHPENV_ROOT="/home/travis/.phpenv"
280274
if [ -d "${PHPENV_ROOT}" ]; then
@@ -296,7 +290,7 @@ jobs:
296290
- |
297291
if ! command -v phpenv; then
298292
pushd $HOME
299-
curl -L http://git.io/phpenv-installer | bash
293+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
300294
popd
301295
export PHPENV_ROOT="/home/travis/.phpenv"
302296
if [ -d "${PHPENV_ROOT}" ]; then
@@ -317,7 +311,7 @@ jobs:
317311
- |
318312
if ! command -v phpenv; then
319313
pushd $HOME
320-
curl -L http://git.io/phpenv-installer | bash
314+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
321315
popd
322316
export PHPENV_ROOT="/home/travis/.phpenv"
323317
if [ -d "${PHPENV_ROOT}" ]; then
@@ -338,7 +332,7 @@ jobs:
338332
- |
339333
if ! command -v phpenv; then
340334
pushd $HOME
341-
curl -L http://git.io/phpenv-installer | bash
335+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
342336
popd
343337
export PHPENV_ROOT="/home/travis/.phpenv"
344338
if [ -d "${PHPENV_ROOT}" ]; then
@@ -360,7 +354,7 @@ jobs:
360354
- |
361355
if ! command -v phpenv; then
362356
pushd $HOME
363-
curl -L http://git.io/phpenv-installer | bash
357+
curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash
364358
popd
365359
export PHPENV_ROOT="/home/travis/.phpenv"
366360
if [ -d "${PHPENV_ROOT}" ]; then
@@ -371,7 +365,7 @@ jobs:
371365
env:
372366
global:
373367
- VERSION=master ALIAS=nightly
374-
- ICU_RELEASE=59.1
368+
- ICU_RELEASE=74.2
375369
- ICU_INSTALL_DIR=$HOME/.phpenv/versions/$VERSION
376370
- PATH="$HOME/.phpenv/bin:$HOME/.php-build/bin:$PATH"
377371

@@ -436,17 +430,29 @@ script:
436430
- export PKG_CONFIG_PATH="$HOME/.phpenv/versions/$VERSION/lib/pkgconfig:$PKG_CONFIG_PATH"
437431
- ./bin/compile
438432
- | # disable 3rd-party extension builds on master
439-
if [[ ! $VERSION =~ ^master$ ]]; then
433+
if [[ $VERSION =~ ^7.3.* ]]; then
440434
(yes '' | ./bin/compile-extension-redis) &&
441-
(./bin/compile-extension-mongo;
442-
./bin/compile-extension-mongodb) &&
435+
(./bin/compile-extension-mongo) &&
443436
./bin/compile-extension-amqp &&
444437
./bin/compile-extension-apcu &&
445438
./bin/compile-extension-zmq &&
446439
(./bin/compile-extension-memcache;
447440
./bin/compile-extension-memcached) &&
448441
./bin/compile-extension-ssh2 &&
449442
sed -i '/^extension=/d' $INSTALL_DEST/$VERSION/etc/php.ini
443+
else
444+
if [[ ! $VERSION =~ ^master$ ]]; then
445+
(yes '' | ./bin/compile-extension-redis) &&
446+
(./bin/compile-extension-mongo;
447+
./bin/compile-extension-mongodb) &&
448+
./bin/compile-extension-amqp &&
449+
./bin/compile-extension-apcu &&
450+
./bin/compile-extension-zmq &&
451+
(./bin/compile-extension-memcache;
452+
./bin/compile-extension-memcached) &&
453+
./bin/compile-extension-ssh2 &&
454+
sed -i '/^extension=/d' $INSTALL_DEST/$VERSION/etc/php.ini
455+
fi
450456
fi
451457
452458
after_success:

‎bin/compile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export PATH="$HOME/.phpenv/bin:$HOME/.php-build/bin:$PATH"
6363
buildDefinition=${VERSION}
6464
if [[ $VERSION == nightly* || $VERSION == master* ]]; then
6565
if [[ $RELEASE == jammy ]]; then
66-
buildDefinition=8.1snapshot
66+
buildDefinition=8.3snapshot
6767
else
6868
buildDefinition=8.0snapshot
6969
fi
@@ -105,7 +105,7 @@ chmod +x bin/composer bin/phpunit
105105

106106
popd
107107

108-
mkdir -p "${INSTALL_DEST}/${VERSION}/etc/conf.d"
108+
sudo mkdir -p "${INSTALL_DEST}/${VERSION}/etc/conf.d"
109109

110110
cat > "${INSTALL_DEST}/${VERSION}/etc/conf.d/travis.ini" <<EOF
111111
memory_limit = 1G

‎bin/compile-extension-amqp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ git clone https://github.com/alanxz/rabbitmq-c.git
1111
pushd rabbitmq-c
1212
git submodule init
1313
git submodule update
14-
autoreconf -i && ./configure --prefix $INSTALL_DEST/$VERSION && make && make install
14+
autoreconf -i && ./configure --prefix $INSTALL_DEST/$VERSION && make && sudo make install
1515

1616
popd
1717

1818
git clone https://github.com/pdezwart/php-amqp.git
1919
pushd php-amqp
2020

2121
phpize
22-
./configure && make && make install
22+
./configure && make && sudo make install
2323
popd
2424

2525
travis_time_finish

‎bin/compile-extension-apcu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ source $(dirname $0)/compile-extensions-common
66
travis_time_start
77

88
if [[ ! $VERSION =~ ^7 && ! $VERSION =~ ^8 && ! $VERSION =~ ^master$ ]]; then
9-
apcu=apcu-4.0.11
9+
apcu=apcu-5.1.23
1010
else
1111
apcu=apcu
1212
fi
1313

14-
pecl channel-update pecl.php.net
14+
sudo pecl channel-update pecl.php.net
1515

1616
echo | pecl_install $apcu
1717

‎bin/compile-extension-memcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [[ ! $VERSION =~ ^7 && ! $VERSION =~ ^8 && ! $VERSION =~ ^master$ ]]; then
1010
tar zxvf memcache*.tgz && pushd memcache*/
1111
make clean || true
1212
phpize
13-
./configure && make && make install
13+
./configure && make && sudo make install
1414
popd
1515
fi
1616

‎bin/compile-extension-memcached

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function install_memcache() {
88
wget https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
99
tar xzf libmemcached-1.0.18.tar.gz
1010
pushd libmemcached-1.0.18
11-
./configure --prefix=$INSTALL_DEST/$VERSION && make && make install
11+
./configure --prefix=$INSTALL_DEST/$VERSION && make && sudo make install
1212
popd
1313
popd
1414
}
@@ -27,7 +27,7 @@ else
2727
make clean || true
2828
fi
2929
phpize
30-
./configure --with-libmemcached-dir=$INSTALL_DEST/$VERSION && make && make install
30+
./configure --with-libmemcached-dir=$INSTALL_DEST/$VERSION && make && sudo make install
3131
popd
3232

3333
travis_time_finish

‎bin/compile-extension-mongo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [[ ! $VERSION =~ ^7 && ! $VERSION =~ ^8 && ! $VERSION =~ ^master$ ]]; then
1010
pushd mongo-php-driver-legacy
1111
git checkout 1.6.16
1212
phpize
13-
./configure && make && make install
13+
./configure && make && sudo make install
1414
popd
1515
fi
1616

‎bin/compile-extension-mongodb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if [[ $VERSION =~ ^master$ || $VERSION =~ snapshot$ ]]; then
1212
phpize
1313
./configure
1414
make all
15-
make install
15+
sudo make install
1616
popd
1717
else
18-
pecl_install mongodb
18+
no | pecl_install mongodb
1919
fi
2020

2121
travis_time_finish

‎bin/compile-extension-redis

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ if [[ $VERSION =~ ^8 || $VERSION =~ ^master$ || $VERSION =~ snapshot$ ]]; then
1010
pushd phpredis
1111
# git checkout php7
1212
phpize
13-
./configure && make && make install || exit 1
13+
./configure && make && sudo make install || exit 1
1414
popd
1515
elif [[ $VERSION =~ ^7 ]]; then
1616
pecl_install redis
1717
else
18-
pecl_install redis-2.2.8
18+
pecl_install redis-6.0.2
1919
fi
2020

2121
travis_time_finish

0 commit comments

Comments
 (0)