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 a5dd57f

Browse filesBrowse files
minor #29979 Enable PHP 7.3 on Travis (tvlooy)
This PR was merged into the 3.4 branch. Discussion ---------- Enable PHP 7.3 on Travis | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The bits of #29624 that apply to 3.4. Commits ------- 335036c Enable PHP 7.3 on Travis
2 parents ebed00f + 335036c commit a5dd57f
Copy full SHA for a5dd57f

File tree

Expand file treeCollapse file tree

2 files changed

+38
-7
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+38
-7
lines changed
Open diff view settings
Collapse file

‎.travis.yml‎

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

1516
env:
1617
global:
@@ -23,10 +24,10 @@ matrix:
2324
sudo: required
2425
group: edge
2526
- php: 5.5
26-
env: php_extra="5.6 7.0"
27-
- php: 7.1
28-
env: deps=high
27+
env: php_extra="5.6 7.0 7.1"
2928
- php: 7.2
29+
env: deps=high
30+
- php: 7.3
3031
env: deps=low
3132
fast_finish: true
3233

@@ -43,6 +44,12 @@ services:
4344
- docker
4445

4546
before_install:
47+
- |
48+
# Enable Sury ppa
49+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
50+
sudo add-apt-repository -y ppa:ondrej/php
51+
sudo apt update
52+
4653
- |
4754
# Start Redis cluster
4855
docker pull grokzen/redis-cluster:4.0.8
@@ -149,7 +156,6 @@ before_install:
149156
echo hhvm.jit = 0 >> $INI
150157
echo apc.enable_cli = 1 >> $INI
151158
echo extension = redis.so >> $INI
152-
echo extension = memcached.so >> $INI
153159
if [[ $PHP = 5.* ]]; then
154160
echo extension = memcache.so >> $INI
155161
echo extension = mongo.so >> $INI
@@ -174,15 +180,38 @@ before_install:
174180
elif [[ $PHP = 7.* ]]; then
175181
if ! php --ri sodium > /dev/null; then
176182
# install libsodium
177-
sudo add-apt-repository ppa:ondrej/php -y
178-
sudo apt-get update -q
179183
sudo apt-get install libsodium-dev -y
180184
tfold ext.libsodium tpecl libsodium sodium.so $INI
181185
fi
182186
183-
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
187+
tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
184188
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
185189
fi
190+
191+
if [[ $PHP == 7.3 ]]; then
192+
# System libmemcached is missing sasl
193+
LIBMEMCACHED_VERSION=1.0.18
194+
wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
195+
tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
196+
cd "libmemcached-${LIBMEMCACHED_VERSION}"
197+
mkdir -p /opt/libmemcached/${LIBMEMCACHED_VERSION}
198+
./configure --prefix="/opt/libmemcached/${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
199+
make
200+
make install
201+
cd -
202+
203+
EXTMEMCACHED_VERSION=3.1.3
204+
wget https://pecl.php.net/get/memcached-${EXTMEMCACHED_VERSION}.tgz
205+
tar xzvf memcached-${EXTMEMCACHED_VERSION}.tgz
206+
cd memcached-${EXTMEMCACHED_VERSION}
207+
phpize
208+
./configure --with-libmemcached-dir=/opt/libmemcached/${LIBMEMCACHED_VERSION}
209+
make
210+
sudo make install
211+
cd -
212+
fi
213+
214+
echo extension = memcached.so >> $INI
186215
done
187216
188217
- |
Collapse file

‎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.