Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 343d24d

Browse filesBrowse files
Merge branch '3.4' into 4.1
* 3.4: Enable PHP 7.3 on Travis
2 parents aff17e2 + a5dd57f commit 343d24d
Copy full SHA for 343d24d

File tree

Expand file treeCollapse file tree

2 files changed

+54
-14
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+54
-14
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+52-14Lines changed: 52 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ addons:
1111
- language-pack-fr-base
1212
- ldap-utils
1313
- slapd
14-
- librabbitmq-dev
14+
- libsasl2-dev
1515

1616
env:
1717
global:
@@ -22,9 +22,9 @@ env:
2222
matrix:
2323
include:
2424
- php: 7.1
25-
- php: 7.1
26-
env: deps=high
2725
- php: 7.2
26+
env: deps=high
27+
- php: 7.3
2828
env: deps=low
2929

3030
fast_finish: true
@@ -43,6 +43,12 @@ services:
4343
- docker
4444

4545
before_install:
46+
- |
47+
# Enable Sury ppa
48+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
49+
sudo add-apt-repository -y ppa:ondrej/php
50+
sudo apt update
51+
4652
- |
4753
# Start Redis cluster
4854
docker pull grokzen/redis-cluster:4.0.8
@@ -135,7 +141,6 @@ before_install:
135141
echo opcache.enable_cli = 1 >> $INI
136142
echo apc.enable_cli = 1 >> $INI
137143
echo extension = redis.so >> $INI
138-
echo extension = memcached.so >> $INI
139144
done
140145
141146
- |
@@ -144,23 +149,56 @@ before_install:
144149
export PHP=$PHP
145150
phpenv global $PHP
146151
INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
147-
148-
# Install librabbitmq
149-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
150-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
151-
sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
152-
153152
if ! php --ri sodium > /dev/null; then
154153
# install libsodium
155-
sudo add-apt-repository ppa:ondrej/php -y
156-
sudo apt-get update -q
157154
sudo apt-get install libsodium-dev -y
158155
tfold ext.libsodium tpecl libsodium sodium.so $INI
159156
fi
160157
161-
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
158+
tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
162159
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
163-
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
160+
161+
if [[ $PHP == 7.3 ]]; then
162+
# System libmemcached is missing sasl
163+
LIBMEMCACHED_VERSION=1.0.18
164+
wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
165+
tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
166+
cd "libmemcached-${LIBMEMCACHED_VERSION}"
167+
mkdir -p /opt/libmemcached/${LIBMEMCACHED_VERSION}
168+
./configure --prefix="/opt/libmemcached/${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
169+
make
170+
make install
171+
cd -
172+
173+
EXTMEMCACHED_VERSION=3.1.3
174+
wget https://pecl.php.net/get/memcached-${EXTMEMCACHED_VERSION}.tgz
175+
tar xzvf memcached-${EXTMEMCACHED_VERSION}.tgz
176+
cd memcached-${EXTMEMCACHED_VERSION}
177+
phpize
178+
./configure --with-libmemcached-dir=/opt/libmemcached/${LIBMEMCACHED_VERSION}
179+
make
180+
sudo make install
181+
cd -
182+
fi
183+
184+
echo extension = memcached.so >> $INI
185+
186+
if [[ $PHP != 7.3 ]]; then
187+
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
188+
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
189+
sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
190+
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
191+
else
192+
sudo apt install -y librabbitmq-dev
193+
git clone https://github.com/pdezwart/php-amqp.git
194+
cd php-amqp
195+
phpize
196+
./configure
197+
make
198+
sudo make install
199+
cd -
200+
echo extension = amqp.so >> $INI
201+
fi
164202
done
165203
166204
- |

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ public function testCookieOptions()
179179
$gco['cookie_'.$key] = $value;
180180
}
181181

182+
unset($gco['cookie_samesite']);
183+
182184
$this->assertEquals($options, $gco);
183185
}
184186

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.