Merge branch '3.4' into 4.1

* 3.4:
  Enable PHP 7.3 on Travis

.travis.yml

@@ -11,7 +11,7 @@ addons:
         - language-pack-fr-base
         - ldap-utils
         - slapd
-        - librabbitmq-dev
+        - libsasl2-dev
 
 env:
     global:
@@ -22,9 +22,9 @@ env:
 matrix:
     include:
         - php: 7.1
-        - php: 7.1
-          env: deps=high
         - php: 7.2
+          env: deps=high
+        - php: 7.3
           env: deps=low
 
     fast_finish: true
@@ -43,6 +43,12 @@ services:
     - docker
 
 before_install:
+    - |
+      # Enable Sury ppa
+      sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
+      sudo add-apt-repository -y ppa:ondrej/php
+      sudo apt update
+
     - |
       # Start Redis cluster
       docker pull grokzen/redis-cluster:4.0.8
@@ -135,7 +141,6 @@ before_install:
           echo opcache.enable_cli = 1 >> $INI
           echo apc.enable_cli = 1 >> $INI
           echo extension = redis.so >> $INI
-          echo extension = memcached.so >> $INI
       done
 
     - |
@@ -144,23 +149,56 @@ before_install:
           export PHP=$PHP
           phpenv global $PHP
           INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
-
-          # Install librabbitmq
-          wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
-          wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
-          sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
-
           if ! php --ri sodium > /dev/null; then
               # install libsodium
-              sudo add-apt-repository ppa:ondrej/php -y
-              sudo apt-get update -q
               sudo apt-get install libsodium-dev -y
               tfold ext.libsodium tpecl libsodium sodium.so $INI
           fi
 
-          tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
+          tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
           tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
-          tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
+
+          if [[ $PHP == 7.3 ]]; then
+              # System libmemcached is missing sasl
+              LIBMEMCACHED_VERSION=1.0.18
+              wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
+              tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
+              cd "libmemcached-${LIBMEMCACHED_VERSION}"
+              mkdir -p /opt/libmemcached/${LIBMEMCACHED_VERSION}
+              ./configure --prefix="/opt/libmemcached/${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
+              make
+              make install
+              cd -
+
+              EXTMEMCACHED_VERSION=3.1.3
+              wget https://pecl.php.net/get/memcached-${EXTMEMCACHED_VERSION}.tgz
+              tar xzvf memcached-${EXTMEMCACHED_VERSION}.tgz
+              cd memcached-${EXTMEMCACHED_VERSION}
+              phpize
+              ./configure --with-libmemcached-dir=/opt/libmemcached/${LIBMEMCACHED_VERSION}
+              make
+              sudo make install
+              cd -
+          fi
+
+          echo extension = memcached.so >> $INI
+
+           if [[ $PHP != 7.3 ]]; then
+              wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
+              wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
+              sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb
+              tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
+          else
+              sudo apt install -y librabbitmq-dev
+              git clone https://github.com/pdezwart/php-amqp.git
+              cd php-amqp
+              phpize
+              ./configure
+              make
+              sudo make install
+              cd -
+              echo extension = amqp.so >> $INI
+          fi
       done
 
     - |

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

@@ -179,6 +179,8 @@ public function testCookieOptions()
             $gco['cookie_'.$key] = $value;
         }
 
+        unset($gco['cookie_samesite']);
+
         $this->assertEquals($options, $gco);
     }