Merge branch '2.8' into 3.3

* 2.8:
  [travis] add ldap.so for php70
  [HttpFoundation] Fix logic when JsonSerializable is missing

Author: nicolas-grekas

.travis.yml

@@ -128,6 +128,11 @@ before_install:
 
     - |
       # Install extra PHP extensions
+      if [[ ! $skip && $PHP = 7.0 ]]; then
+          wget https://github.com/symfony/binary-utils/releases/download/v0.1/ldap-php70.tar.bz2
+          tar -xjf ldap-php70.tar.bz2
+          echo extension = $(pwd)/ldap.so >> $INI
+      fi
       if [[ ! $skip && $PHP = 5.* ]]; then
           ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
           tfold ext.apcu4 'echo yes | pecl install -f apcu-4.0.11'

src/Symfony/Component/HttpFoundation/JsonResponse.php

@@ -145,21 +145,22 @@ public function setData($data = array())
             // If only PHP did the same...
             $data = json_encode($data, $this->encodingOptions);
         } else {
-            try {
-                if (!interface_exists('JsonSerializable', false)) {
-                    set_error_handler(function () { return false; });
+            if (!interface_exists('JsonSerializable', false)) {
+                set_error_handler(function () { return false; });
+                try {
                     $data = @json_encode($data, $this->encodingOptions);
-                    restore_error_handler();
-                } else {
-                    $data = json_encode($data, $this->encodingOptions);
-                }
-            } catch (\Exception $e) {
-                if (!interface_exists('JsonSerializable', false)) {
+                } finally {
                      restore_error_handler();
-                } elseif ('Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
-                    throw $e->getPrevious() ?: $e;
                 }
-                throw $e;
+            } else {
+                try {
+                    $data = json_encode($data, $this->encodingOptions);
+                } catch (\Exception $e) {
+                    if ('Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+                        throw $e->getPrevious() ?: $e;
+                    }
+                    throw $e;
+                }
             }
         }