Skip to content

Commit ce3b4f2

Browse files
Fix support for PHP 7.3
1 parent cb13594 commit ce3b4f2

File tree

3 files changed

+8
-36
lines changed

3 files changed

+8
-36
lines changed

.travis.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: php
22

3-
dist: trusty
3+
dist: xenial
44
sudo: false
55

66
git:
@@ -13,6 +13,7 @@ addons:
1313
- ldap-utils
1414
- slapd
1515
- librabbitmq-dev
16+
- libzip4
1617

1718
env:
1819
global:
@@ -22,11 +23,7 @@ env:
2223

2324
matrix:
2425
include:
25-
- php: 7.1
26-
- php: 7.1
27-
env: deps=high
28-
- php: 7.2
29-
env: deps=low
26+
- php: 7.3.0RC1
3027

3128
fast_finish: true
3229

@@ -37,8 +34,6 @@ cache:
3734
- ~/php-ext
3835

3936
services:
40-
- memcached
41-
- mongodb
4237
- redis-server
4338
- rabbitmq
4439
- docker
@@ -136,31 +131,6 @@ before_install:
136131
echo opcache.enable_cli = 1 >> $INI
137132
echo apc.enable_cli = 1 >> $INI
138133
echo extension = redis.so >> $INI
139-
echo extension = memcached.so >> $INI
140-
done
141-
142-
- |
143-
# Install extra PHP extensions
144-
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
145-
export PHP=$PHP
146-
phpenv global $PHP
147-
INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
148-
149-
# Install librabbitmq
150-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
151-
wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
152-
sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
153-
154-
# install libsodium
155-
sudo add-apt-repository ppa:ondrej/php -y
156-
sudo apt-get update -q
157-
sudo apt-get install libsodium-dev -y
158-
159-
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
160-
tfold ext.libsodium tpecl libsodium sodium.so $INI
161-
tfold ext.mongodb tpecl mongodb-1.5.0 mongodb.so $INI
162-
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
163-
tfold ext.igbinary tpecl igbinary-2.0.6 igbinary.so $INI
164134
done
165135
166136
- |
@@ -222,7 +192,6 @@ install:
222192
break
223193
fi
224194
phpenv global $PHP
225-
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
226195
tfold 'composer update' $COMPOSER_UP
227196
tfold 'phpunit install' ./phpunit install
228197
if [[ $deps = high ]]; then

src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test catching fatal errors when handlers are nested
3+
--INI--
4+
display_errors=0
35
--FILE--
46
<?php
57

@@ -24,7 +26,6 @@ if (true) {
2426

2527
?>
2628
--EXPECTF--
27-
Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
2829
object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
2930
["message":protected]=>
3031
string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".

src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ public function destroy($sessionId)
128128
if (\PHP_VERSION_ID < 70300) {
129129
setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
130130
} else {
131-
setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'), ini_get('session.cookie_samesite'));
131+
$params = session_get_cookie_params();
132+
unset($params['lifetime']);
133+
setcookie($this->sessionName, '', $params);
132134
}
133135
}
134136
}

0 commit comments

Comments
 (0)