8000 Merge branch '4.2' · symfony/symfony@8edddfa · GitHub
[go: up one dir, main page]
Skip to content

Commit 8edddfa

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.2'
* 4.2: [Process] disable transient test on Windows Enable PHP 7.3 on Travis
2 parents 2893898 + 25f9ec6 commit 8edddfa

File tree

2 files changed

+58
-16
lines changed

2 files changed

+58
-16
lines changed

‎.travis.yml

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ addons:
1111
- language-pack-fr-base
1212
- ldap-utils
1313
- slapd
14-
- librabbitmq-dev
1514
- zookeeperd
1615
- libzookeeper-mt-dev
16+
- libsasl2-dev
1717

1818
env:
1919
global:
@@ -24,9 +24,9 @@ env:
2424
matrix:
2525
include:
2626
- php: 7.1
27-
- php: 7.1
28-
env: deps=high
2927
- php: 7.2
28+
env: deps=high
29+
- php: 7.3
3030
env: deps=low
3131

3232
fast_finish: true
@@ -45,6 +45,12 @@ services:
4545
- docker
4646

4747
before_install:
48+
- |
49+
# Enable Sury ppa
50+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
51+
sudo add-apt-repository -y ppa:ondrej/php
52+
sudo apt update
53+
4854
- |
4955
# Start Redis cluster
5056
docker pull grokzen/redis-cluster:4.0.8
@@ -137,7 +143,6 @@ before_install:
137143
echo opcache.enable_cli = 1 >> $INI
138144
echo apc.enable_cli = 1 >> $INI
139145
echo extension = redis.so >> $INI
140-
echo extension = memcached.so >> $INI
141146
done
142147
143148
- |
@@ -146,25 +151,58 @@ before_install:
146151
export PHP=$PHP
147152
phpenv global $PHP
148153
INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
149-
150-
# Install librabbitmq
151-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
152-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
153-
sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
154-
155154
if ! php --ri sodium > /dev/null; then
156155
# install libsodium
157-
sudo add-apt-repository ppa:ondrej/php -y
158-
sudo apt-get update -q
159156
sudo apt-get install libsodium-dev -y
160157
tfold ext.libsodium tpecl libsodium sodium.so $INI
161158
fi
162159
163-
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
160+
tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
164161
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
165-
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
166-
tfold ext.igbinary tpecl igbinary-2.0.6 igbinary.so $INI
167-
tfold ext.zookeeper tpecl zookeeper-0.5.0 zookeeper.so $INI
162+
tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
163+
tfold ext.zookeeper tpecl zookeeper-0.6.0 zookeeper.so $INI
164+
165+
if [[ $PHP == 7.3 ]]; then
166+
# System libmemcached is missing sasl
167+
LIBMEMCACHED_VERSION=1.0.18
168+
wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
169+
tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
170+
cd "libmemcached-${LIBMEMCACHED_VERSION}"
171+
mkdir -p /opt/libmemcached/${LIBMEMCACHED_VERSION}
172+
./configure --prefix="/opt/libmemcached/${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
173+
make
174+
make install
175+
cd -
176+
177+
EXTMEMCACHED_VERSION=3.1.3
178+
wget https://pecl.php.net/get/memcached-${EXTMEMCACHED_VERSION}.tgz
179+
tar xzvf memcached-${EXTMEMCACHED_VERSION}.tgz
180+
cd memcached-${EXTMEMCACHED_VERSION}
181+
phpize
182+
./configure --with-libmemcached-dir=/opt/libmemcached/${LIBMEMCACHED_VERSION}
183+
make
184+
sudo make install
185+
cd -
186+
fi
187+
188+
echo extension = memcached.so >> $INI
189+
190+
if [[ $PHP != 7.3 ]]; then
191+
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
192+
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
193+
sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
194+
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
195+
else
196+
sudo apt install -y librabbitmq-dev
197+
git clone https://github.com/pdezwart/php-amqp.git
198+
cd php-amqp
199+
phpize
200+
./configure
201+
make
202+
sudo make install
203+
cd -
204+
echo extension = amqp.so >> $INI
205+
fi
168206
done
169207
170208
- |

‎src/Symfony/Component/Process/Tests/ProcessTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ public function testStopWithTimeoutIsActuallyWorking()
135135

136136
public function testWaitUntilSpecificOutput()
137137
{
138+
if ('\\' === \DIRECTORY_SEPARATOR) {
139+
$this->markTestIncomplete('This test is too transient on Windows, help wanted to improve it');
140+
}
141+
138142
$p = $this->getProcess([self::$phpBin, __DIR__.'/KillableProcessWithOutput.php']);
139143
$p->start();
140144

0 commit comments

Comments
 (0)
0