Core and composer updates

2017-07-03 16:47:07 +01:00 · 2017-07-03 16:47:07 +01:00 · 62cac30480
commit 62cac30480
parent a82634bb98
1118 changed files with 21770 additions and 6306 deletions
--- a/web/vendor/composer/autoload_files.php
+++ b/web/vendor/composer/autoload_files.php
@ -14,6 +14,6 @@ return array(
    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
 );
--- a/web/vendor/composer/autoload_psr4.php
+++ b/web/vendor/composer/autoload_psr4.php
@ -13,6 +13,7 @@ return array(
    'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'),
    'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
    'Wikimedia\\Composer\\' => array($vendorDir . '/wikimedia/composer-merge-plugin/src'),
+    'Twig\\' => array($vendorDir . '/twig/twig/src'),
    'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'),
    'Symfony\\Polyfill\\Php54\\' => array($vendorDir . '/symfony/polyfill-php54'),
    'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
--- a/web/vendor/composer/autoload_static.php
+++ b/web/vendor/composer/autoload_static.php
@ -15,8 +15,8 @@ class ComposerStaticInitDrupal8
        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
    );

    public static $prefixLengthsPsr4 = array (
@ -33,6 +33,10 @@ class ComposerStaticInitDrupal8
        array (
            'Wikimedia\\Composer\\' => 19,
        ),
+        'T' => 
+        array (
+            'Twig\\' => 5,
+        ),
        'S' => 
        array (
            'Symfony\\Polyfill\\Php55\\' => 23,
@ -129,6 +133,10 @@ class ComposerStaticInitDrupal8
        array (
            0 => __DIR__ . '/..' . '/wikimedia/composer-merge-plugin/src',
        ),
+        'Twig\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/twig/twig/src',
+        ),
        'Symfony\\Polyfill\\Php55\\' => 
        array (
            0 => __DIR__ . '/..' . '/symfony/polyfill-php55',
--- a/web/vendor/composer/installed.json
+++ b/web/vendor/composer/installed.json
--- a/web/vendor/guzzlehttp/guzzle/.travis.yml
+++ b/web/vendor/guzzlehttp/guzzle/.travis.yml
@ -1,41 +0,0 @@
-language: php
-
-sudo: false
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
-
-before_script:
-  - curl --version
-  - composer install --no-interaction --prefer-source --dev
-  - ~/.nvm/nvm.sh install v0.6.14
-  - ~/.nvm/nvm.sh run v0.6.14
-  - '[ "$TRAVIS_PHP_VERSION" != "7.0" ] || echo "xdebug.overload_var_dump = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini'
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
-
-before_deploy:
-  - rvm 1.9.3 do gem install mime-types -v 2.6.2
-  - make package
-
-deploy:
-  provider: releases
-  api_key:
-    secure: UpypqlYgsU68QT/x40YzhHXvzWjFwCNo9d+G8KAdm7U9+blFfcWhV1aMdzugvPMl6woXgvJj7qHq5tAL4v6oswCORhpSBfLgOQVFaica5LiHsvWlAedOhxGmnJqMTwuepjBCxXhs3+I8Kof1n4oUL9gKytXjOVCX/f7XU1HiinU=
-  file:
-    - build/artifacts/guzzle.phar
-    - build/artifacts/guzzle.zip
-  on:
-    repo: guzzle/guzzle
-    tags: true
-    all_branches: true
-    php: 5.5
--- a/web/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/web/vendor/guzzlehttp/guzzle/CHANGELOG.md
@ -1,5 +1,26 @@
 # CHANGELOG

+## 6.3.0 - 2017-06-22
+
+* Feature: force IP resolution (ipv4 or ipv6) [#1608](https://github.com/guzzle/guzzle/pull/1608), [#1659](https://github.com/guzzle/guzzle/pull/1659)
+* Improvement: Don't include summary in exception message when body is empty [#1621](https://github.com/guzzle/guzzle/pull/1621)
+* Improvement: Handle `on_headers` option in MockHandler [#1580](https://github.com/guzzle/guzzle/pull/1580)
+* Improvement: Added SUSE Linux CA path [#1609](https://github.com/guzzle/guzzle/issues/1609)
+* Improvement: Use class reference for getting the name of the class instead of using hardcoded strings [#1641](https://github.com/guzzle/guzzle/pull/1641)
+* Feature: Added `read_timeout` option [#1611](https://github.com/guzzle/guzzle/pull/1611)
+* Bug fix: PHP 7.x fixes [#1685](https://github.com/guzzle/guzzle/pull/1685), [#1686](https://github.com/guzzle/guzzle/pull/1686), [#1811](https://github.com/guzzle/guzzle/pull/1811)
+* Deprecation: BadResponseException instantiation without a response [#1642](https://github.com/guzzle/guzzle/pull/1642)
+* Feature: Added NTLM auth [#1569](https://github.com/guzzle/guzzle/pull/1569)
+* Feature: Track redirect HTTP status codes [#1711](https://github.com/guzzle/guzzle/pull/1711)
+* Improvement: Check handler type during construction [#1745](https://github.com/guzzle/guzzle/pull/1745)
+* Improvement: Always include the Content-Length if there's a body [#1721](https://github.com/guzzle/guzzle/pull/1721)
+* Feature: Added convenience method to access a cookie by name [#1318](https://github.com/guzzle/guzzle/pull/1318)
+* Bug fix: Fill `CURLOPT_CAPATH` and `CURLOPT_CAINFO` properly [#1684](https://github.com/guzzle/guzzle/pull/1684)
+* Improvement:  	Use `\GuzzleHttp\Promise\rejection_for` function instead of object init [#1827](https://github.com/guzzle/guzzle/pull/1827)
+
+
+ Minor code cleanups, documentation fixes and clarifications.
+
 ## 6.2.3 - 2017-02-28

 * Fix deprecations with guzzle/psr7 version 1.4
--- a/web/vendor/guzzlehttp/guzzle/README.md
+++ b/web/vendor/guzzlehttp/guzzle/README.md
@ -19,15 +19,13 @@ trivial to integrate with web services.

 ```php
 $client = new \GuzzleHttp\Client();
-$res = $client->request('GET', 'https://api.github.com/user', [
-    'auth' => ['user', 'pass']
-]);
+$res = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
 echo $res->getStatusCode();
 // 200
 echo $res->getHeaderLine('content-type');
 // 'application/json; charset=utf8'
 echo $res->getBody();
-// {"type":"User"...'
+// '{"id": 1420053, "name": "guzzle", ...}'

 // Send an asynchronous request.
 $request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
@ -40,7 +38,7 @@ $promise->wait();
 ## Help and docs

 - [Documentation](http://guzzlephp.org/)
- [stackoverflow](http://stackoverflow.com/questions/tagged/guzzle)
+- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
 - [Gitter](https://gitter.im/guzzle/guzzle)


@ -75,14 +73,15 @@ composer.phar update

 ## Version Guidance

-| Version | Status      | Packagist           | Namespace    | Repo                | Docs                | PSR-7 |
-|---------|-------------|---------------------|--------------|---------------------|---------------------|-------|
-| 3.x     | EOL         | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    |
-| 4.x     | EOL         | `guzzlehttp/guzzle` | `GuzzleHttp` | N/A                 | N/A                 | No    |
-| 5.x     | Maintained  | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    |
-| 6.x     | Latest      | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   |
+| Version | Status     | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version |
+|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
+| 3.x     | EOL        | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >= 5.3.3    |
+| 4.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >= 5.4      |
+| 5.x     | Maintained | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
+| 6.x     | Latest     | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >= 5.5      |

 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
+[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
 [guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
 [guzzle-6-repo]: https://github.com/guzzle/guzzle
 [guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
--- a/web/vendor/guzzlehttp/guzzle/composer.json
+++ b/web/vendor/guzzlehttp/guzzle/composer.json
@ -19,7 +19,7 @@
    },
    "require-dev": {
        "ext-curl": "*",
-        "phpunit/phpunit": "^4.0",
+        "phpunit/phpunit": "^4.0 || ^5.0",
        "psr/log": "^1.0"
    },
    "autoload": {
@ -33,6 +33,9 @@
            "GuzzleHttp\\Tests\\": "tests/"
        }
    },
+    "suggest": {
+        "psr/log": "Required for using the Log middleware"
+    },
    "extra": {
        "branch-alias": {
            "dev-master": "6.2-dev"
--- a/web/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Client.php
@ -63,6 +63,8 @@ class Client implements ClientInterface
    {
        if (!isset($config['handler'])) {
            $config['handler'] = HandlerStack::create();
+        } elseif (!is_callable($config['handler'])) {
+            throw new \InvalidArgumentException('handler must be a callable');
        }

        // Convert the base_uri to a UriInterface
@ -350,6 +352,10 @@ class Client implements ClientInterface
                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
                    break;
+                case 'ntlm':
+                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_NTLM;
+                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
+                    break;
            }
        }

@ -402,7 +408,7 @@ class Client implements ClientInterface
        throw new \InvalidArgumentException('Passing in the "body" request '
            . 'option as an array to send a POST request has been deprecated. '
            . 'Please use the "form_params" request option to send a '
-            . 'application/x-www-form-urlencoded request, or a the "multipart" '
+            . 'application/x-www-form-urlencoded request, or the "multipart" '
            . 'request option to send a multipart/form-data request.');
    }
 }
--- a/web/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@ -86,6 +86,25 @@ class CookieJar implements CookieJarInterface
        return false;
    }

+    /**
+     * Finds and returns the cookie based on the name
+     *
+     * @param string $name cookie name to search for
+     * @return SetCookie|null cookie that was found or null if not found
+     */
+    public function getCookieByName($name)
+    {
+        // don't allow a null name
+        if($name === null) {
+            return null;
+        }
+        foreach($this->cookies as $cookie) {
+            if($cookie->getName() !== null && strcasecmp($cookie->getName(), $name) === 0) {
+                return $cookie;
+            }
+        }
+    }
+
    public function toArray()
    {
        return array_map(function (SetCookie $cookie) {
@ -216,11 +235,41 @@ class CookieJar implements CookieJarInterface
                if (!$sc->getDomain()) {
                    $sc->setDomain($request->getUri()->getHost());
                }
+                if (0 !== strpos($sc->getPath(), '/')) {
+                    $sc->setPath($this->getCookiePathFromRequest($request));
+                }
                $this->setCookie($sc);
            }
        }
    }

+    /**
+     * Computes cookie path following RFC 6265 section 5.1.4
+     *
+     * @link https://tools.ietf.org/html/rfc6265#section-5.1.4
+     *
+     * @param RequestInterface $request
+     * @return string
+     */
+    private function getCookiePathFromRequest(RequestInterface $request)
+    {
+        $uriPath = $request->getUri()->getPath();
+        if (''  === $uriPath) {
+            return '/';
+        }
+        if (0 !== strpos($uriPath, '/')) {
+            return '/';
+        }
+        if ('/' === $uriPath) {
+            return '/';
+        }
+        if (0 === $lastSlashPos = strrpos($uriPath, '/')) {
+            return '/';
+        }
+
+        return substr($uriPath, 0, $lastSlashPos);
+    }
+
    public function withCookieHeader(RequestInterface $request)
    {
        $values = [];
--- a/web/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
@ -1,7 +1,27 @@
 <?php
 namespace GuzzleHttp\Exception;

+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
 /**
 * Exception when an HTTP error occurs (4xx or 5xx error)
 */
-class BadResponseException extends RequestException {}
+class BadResponseException extends RequestException
+{
+    public function __construct(
+        $message,
+        RequestInterface $request,
+        ResponseInterface $response = null,
+        \Exception $previous = null,
+        array $handlerContext = []
+    ) {
+        if (null === $response) {
+            @trigger_error(
+                'Instantiating the ' . __CLASS__ . ' class without a Response is deprecated since version 6.3 and will be removed in 7.0.',
+                E_USER_DEPRECATED
+            );
+        }
+        parent::__construct($message, $request, $response, $previous, $handlerContext);
+    }
+}
--- a/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
@ -81,10 +81,10 @@ class RequestException extends TransferException
        $level = (int) floor($response->getStatusCode() / 100);
        if ($level === 4) {
            $label = 'Client error';
-            $className = __NAMESPACE__ . '\\ClientException';
+            $className = ClientException::class;
        } elseif ($level === 5) {
            $label = 'Server error';
-            $className = __NAMESPACE__ . '\\ServerException';
+            $className = ServerException::class;
        } else {
            $label = 'Unsuccessful request';
            $className = __CLASS__;
@ -93,13 +93,15 @@ class RequestException extends TransferException
        $uri = $request->getUri();
        $uri = static::obfuscateUri($uri);

-        // Server Error: `GET /` resulted in a `404 Not Found` response:
+        // Client Error: `GET /` resulted in a `404 Not Found` response:
        // <html> ... (truncated)
        $message = sprintf(
-            '%s: `%s` resulted in a `%s` response',
+            '%s: `%s %s` resulted in a `%s %s` response',
            $label,
-            $request->getMethod() . ' ' . $uri,
-            $response->getStatusCode() . ' ' . $response->getReasonPhrase()
+            $request->getMethod(),
+            $uri,
+            $response->getStatusCode(),
+            $response->getReasonPhrase()
        );

        $summary = static::getResponseBodySummary($response);
@ -129,6 +131,11 @@ class RequestException extends TransferException
        }

        $size = $body->getSize();
+
+        if ($size === 0) {
+            return null;
+        }
+
        $summary = $body->read(120);
        $body->rewind();

--- a/web/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@ -16,7 +16,7 @@ use Psr\Http\Message\RequestInterface;
 class CurlFactory implements CurlFactoryInterface
 {
    /** @var array */
-    private $handles;
+    private $handles = [];

    /** @var int Total number of idle handles to keep in cache */
    private $maxHandles;
@ -163,7 +163,7 @@ class CurlFactory implements CurlFactoryInterface
        // If an exception was encountered during the onHeaders event, then
        // return a rejected promise that wraps that exception.
        if ($easy->onHeadersException) {
-            return new RejectedPromise(
+            return \GuzzleHttp\Promise\rejection_for(
                new RequestException(
                    'An error was encountered during the on_headers event',
                    $easy->request,
@ -186,7 +186,7 @@ class CurlFactory implements CurlFactoryInterface
            ? new ConnectException($message, $easy->request, null, $ctx)
            : new RequestException($message, $easy->request, $easy->response, null, $ctx);

-        return new RejectedPromise($error);
+        return \GuzzleHttp\Promise\rejection_for($error);
    }

    private function getDefaultConf(EasyHandle $easy)
@ -326,12 +326,20 @@ class CurlFactory implements CurlFactoryInterface
                $conf[CURLOPT_SSL_VERIFYHOST] = 2;
                $conf[CURLOPT_SSL_VERIFYPEER] = true;
                if (is_string($options['verify'])) {
-                    $conf[CURLOPT_CAINFO] = $options['verify'];
+                    // Throw an error if the file/folder/link path is not valid or doesn't exist.
                    if (!file_exists($options['verify'])) {
                        throw new \InvalidArgumentException(
                            "SSL CA bundle not found: {$options['verify']}"
                        );
                    }
+                    // If it's a directory or a link to a directory use CURLOPT_CAPATH.
+                    // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
+                    if (is_dir($options['verify']) ||
+                        (is_link($options['verify']) && is_dir(readlink($options['verify'])))) {
+                        $conf[CURLOPT_CAPATH] = $options['verify'];
+                    } else {
+                        $conf[CURLOPT_CAINFO] = $options['verify'];
+                    }
                }
            }
        }
@ -370,15 +378,30 @@ class CurlFactory implements CurlFactoryInterface
            $conf[CURLOPT_FILE] = fopen('php://temp', 'w+');
            $easy->sink = Psr7\stream_for($conf[CURLOPT_FILE]);
        }
-
+        $timeoutRequiresNoSignal = false;
        if (isset($options['timeout'])) {
+            $timeoutRequiresNoSignal |= $options['timeout'] < 1;
            $conf[CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
        }

+        // CURL default value is CURL_IPRESOLVE_WHATEVER
+        if (isset($options['force_ip_resolve'])) {
+            if ('v4' === $options['force_ip_resolve']) {
+                $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V4;
+            } else if ('v6' === $options['force_ip_resolve']) {
+                $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V6;
+            }
+        }
+
        if (isset($options['connect_timeout'])) {
+            $timeoutRequiresNoSignal |= $options['connect_timeout'] < 1;
            $conf[CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
        }

+        if ($timeoutRequiresNoSignal && strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+            $conf[CURLOPT_NOSIGNAL] = true;
+        }
+
        if (isset($options['proxy'])) {
            if (!is_array($options['proxy'])) {
                $conf[CURLOPT_PROXY] = $options['proxy'];
--- a/web/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
@ -1,6 +1,7 @@
 <?php
 namespace GuzzleHttp\Handler;

+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\RejectedPromise;
@ -13,7 +14,7 @@ use Psr\Http\Message\ResponseInterface;
 */
 class MockHandler implements \Countable
 {
-    private $queue;
+    private $queue = [];
    private $lastRequest;
    private $lastOptions;
    private $onFulfilled;
@ -73,12 +74,24 @@ class MockHandler implements \Countable
        $this->lastOptions = $options;
        $response = array_shift($this->queue);

+        if (isset($options['on_headers'])) {
+            if (!is_callable($options['on_headers'])) {
+                throw new \InvalidArgumentException('on_headers must be callable');
+            }
+            try {
+                $options['on_headers']($response);
+            } catch (\Exception $e) {
+                $msg = 'An error was encountered during the on_headers event';
+                $response = new RequestException($msg, $request, $response, $e);
+            }
+        }
+
        if (is_callable($response)) {
            $response = call_user_func($response, $request, $options);
        }

        $response = $response instanceof \Exception
-            ? new RejectedPromise($response)
+            ? \GuzzleHttp\Promise\rejection_for($response)
            : \GuzzleHttp\Promise\promise_for($response);

        return $response->then(
@ -107,7 +120,7 @@ class MockHandler implements \Countable
                if ($this->onRejected) {
                    call_user_func($this->onRejected, $reason);
                }
-                return new RejectedPromise($reason);
+                return \GuzzleHttp\Promise\rejection_for($reason);
            }
        );
    }
@ -145,7 +158,7 @@ class MockHandler implements \Countable
    /**
     * Get the last received request options.
     *
-     * @return RequestInterface
+     * @return array
     */
    public function getLastOptions()
    {
--- a/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@ -67,7 +67,7 @@ class StreamHandler
            $e = RequestException::wrapException($request, $e);
            $this->invokeStats($options, $request, $startTime, null, $e);

-            return new RejectedPromise($e);
+            return \GuzzleHttp\Promise\rejection_for($e);
        }
    }

@ -119,7 +119,7 @@ class StreamHandler
            } catch (\Exception $e) {
                $msg = 'An error was encountered during the on_headers event';
                $ex = new RequestException($msg, $request, $response, $e);
-                return new RejectedPromise($ex);
+                return \GuzzleHttp\Promise\rejection_for($ex);
            }
        }

@ -301,6 +301,18 @@ class StreamHandler
            );
        }

+        // Microsoft NTLM authentication only supported with curl handler
+        if (isset($options['auth'])
+            && is_array($options['auth'])
+            && isset($options['auth'][2])
+            && 'ntlm' == $options['auth'][2]
+        ) {
+
+            throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler');
+        }
+
+        $uri = $this->resolveHost($request, $options);
+
        $context = $this->createResource(
            function () use ($context, $params) {
                return stream_context_create($context, $params);
@ -308,14 +320,45 @@ class StreamHandler
        );

        return $this->createResource(
-            function () use ($request, &$http_response_header, $context) {
-                $resource = fopen((string) $request->getUri()->withFragment(''), 'r', null, $context);
+            function () use ($uri, &$http_response_header, $context, $options) {
+                $resource = fopen((string) $uri, 'r', null, $context);
                $this->lastHeaders = $http_response_header;
+
+                if (isset($options['read_timeout'])) {
+                    $readTimeout = $options['read_timeout'];
+                    $sec = (int) $readTimeout;
+                    $usec = ($readTimeout - $sec) * 100000;
+                    stream_set_timeout($resource, $sec, $usec);
+                }
+
                return $resource;
            }
        );
    }

+    private function resolveHost(RequestInterface $request, array $options)
+    {
+        $uri = $request->getUri();
+
+        if (isset($options['force_ip_resolve']) && !filter_var($uri->getHost(), FILTER_VALIDATE_IP)) {
+            if ('v4' === $options['force_ip_resolve']) {
+                $records = dns_get_record($uri->getHost(), DNS_A);
+                if (!isset($records[0]['ip'])) {
+                    throw new ConnectException(sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
+                }
+                $uri = $uri->withHost($records[0]['ip']);
+            } elseif ('v6' === $options['force_ip_resolve']) {
+                $records = dns_get_record($uri->getHost(), DNS_AAAA);
+                if (!isset($records[0]['ipv6'])) {
+                    throw new ConnectException(sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
+                }
+                $uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
+            }
+        }
+
+        return $uri;
+    }
+
    private function getDefaultContext(RequestInterface $request)
    {
        $headers = '';
--- a/web/vendor/guzzlehttp/guzzle/src/Middleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Middleware.php
@ -102,7 +102,7 @@ final class Middleware
                            'error'    => $reason,
                            'options'  => $options
                        ];
-                        return new RejectedPromise($reason);
+                        return \GuzzleHttp\Promise\rejection_for($reason);
                    }
                );
            };
--- a/web/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
@ -14,9 +14,6 @@ class PrepareBodyMiddleware
    /** @var callable  */
    private $nextHandler;

-    /** @var array */
-    private static $skipMethods = ['GET' => true, 'HEAD' => true];
-
    /**
     * @param callable $nextHandler Next handler to invoke.
     */
@ -36,9 +33,7 @@ class PrepareBodyMiddleware
        $fn = $this->nextHandler;

        // Don't do anything if the request has no body.
-        if (isset(self::$skipMethods[$request->getMethod()])
-            || $request->getBody()->getSize() === 0
-        ) {
+        if ($request->getBody()->getSize() === 0) {
            return $fn($request, $options);
        }

@ -54,8 +49,7 @@ class PrepareBodyMiddleware
        }

        // Add a default content-length or transfer-encoding header.
-        if (!isset(self::$skipMethods[$request->getMethod()])
-            && !$request->hasHeader('Content-Length')
+        if (!$request->hasHeader('Content-Length')
            && !$request->hasHeader('Transfer-Encoding')
        ) {
            $size = $request->getBody()->getSize();
--- a/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@ -19,6 +19,8 @@ class RedirectMiddleware
 {
    const HISTORY_HEADER = 'X-Guzzle-Redirect-History';

+    const STATUS_HISTORY_HEADER = 'X-Guzzle-Redirect-Status-History';
+
    public static $defaultSettings = [
        'max'             => 5,
        'protocols'       => ['http', 'https'],
@ -108,23 +110,27 @@ class RedirectMiddleware
        if (!empty($options['allow_redirects']['track_redirects'])) {
            return $this->withTracking(
                $promise,
-                (string) $nextRequest->getUri()
+                (string) $nextRequest->getUri(),
+                $response->getStatusCode()
            );
        }

        return $promise;
    }

-    private function withTracking(PromiseInterface $promise, $uri)
+    private function withTracking(PromiseInterface $promise, $uri, $statusCode)
    {
        return $promise->then(
-            function (ResponseInterface $response) use ($uri) {
+            function (ResponseInterface $response) use ($uri, $statusCode) {
                // Note that we are pushing to the front of the list as this
                // would be an earlier response than what is currently present
                // in the history header.
-                $header = $response->getHeader(self::HISTORY_HEADER);
-                array_unshift($header, $uri);
-                return $response->withHeader(self::HISTORY_HEADER, $header);
+                $historyHeader = $response->getHeader(self::HISTORY_HEADER);
+                $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER);
+                array_unshift($historyHeader, $uri);
+                array_unshift($statusHeader, $statusCode);
+                return $response->withHeader(self::HISTORY_HEADER, $historyHeader)
+                                ->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader);
            }
        );
    }
--- a/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php
@ -237,8 +237,19 @@ final class RequestOptions
     */
    const TIMEOUT = 'timeout';

+    /**
+     * read_timeout: (float, default=default_socket_timeout ini setting) Float describing
+     * the body read timeout, for stream requests.
+     */
+    const READ_TIMEOUT = 'read_timeout';
+
    /**
     * version: (float) Specifies the HTTP protocol version to attempt to use.
     */
    const VERSION = 'version';
+
+    /**
+     * force_ip_resolve: (bool) Force client to use only ipv4 or ipv6 protocol
+     */
+    const FORCE_IP_RESOLVE = 'force_ip_resolve';
 }
--- a/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
@ -97,7 +97,7 @@ class RetryMiddleware
                null,
                $reason
            )) {
-                return new RejectedPromise($reason);
+                return \GuzzleHttp\Promise\rejection_for($reason);
            }
            return $this->doRetry($req, $options);
        };
--- a/web/vendor/guzzlehttp/guzzle/src/functions.php
+++ b/web/vendor/guzzlehttp/guzzle/src/functions.php
@ -167,6 +167,8 @@ function default_ca_bundle()
        '/etc/ssl/certs/ca-certificates.crt',
        // FreeBSD (provided by the ca_root_nss package)
        '/usr/local/share/certs/ca-root-nss.crt',
+        // SLES 12 (provided by the ca-certificates package)
+        '/var/lib/ca-certificates/ca-bundle.pem',
        // OS X provided by homebrew (using the default path)
        '/usr/local/etc/openssl/cert.pem',
        // Google app engine
--- a/web/vendor/symfony-cmf/routing/Candidates/Candidates.php
+++ b/web/vendor/symfony-cmf/routing/Candidates/Candidates.php
@ -108,7 +108,7 @@ class Candidates implements CandidatesInterface
        }

        $matches = array();
-        if (preg_match('#('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
+        if (preg_match('#^/('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
            return $matches[1];
        }

--- a/web/vendor/symfony-cmf/routing/README.md
+++ b/web/vendor/symfony-cmf/routing/README.md
@ -1,6 +1,6 @@
 # Symfony CMF Routing Component

-[![Build Status](https://secure.travis-ci.org/symfony-cmf/Routing.png?branch=master)](http://travis-ci.org/symfony-cmf/Routing)
+[![Build Status](https://travis-ci.org/symfony-cmf/routing.svg?branch=master)](https://travis-ci.org/symfony-cmf/routing)
 [![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing/version.png)](https://packagist.org/packages/symfony-cmf/routing)
 [![Total Downloads](https://poser.pugx.org/symfony-cmf/routing/d/total.png)](https://packagist.org/packages/symfony-cmf/routing)

--- a/web/vendor/symfony/class-loader/ClassCollectionLoader.php
+++ b/web/vendor/symfony/class-loader/ClassCollectionLoader.php
@ -232,7 +232,7 @@ REGEX;

        $output .= self::compressCode($rawChunk);

-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
            unset($tokens, $rawChunk);
            gc_mem_caches();
--- a/web/vendor/symfony/class-loader/ClassMapGenerator.php
+++ b/web/vendor/symfony/class-loader/ClassMapGenerator.php
@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;

 if (!defined('SYMFONY_TRAIT')) {
-    if (PHP_VERSION_ID >= 50400) {
+    if (\PHP_VERSION_ID >= 50400) {
        define('SYMFONY_TRAIT', T_TRAIT);
    } else {
        define('SYMFONY_TRAIT', 0);
@ -72,7 +72,7 @@ class ClassMapGenerator

            $classes = self::findClasses($path);

-            if (PHP_VERSION_ID >= 70000) {
+            if (\PHP_VERSION_ID >= 70000) {
                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
                gc_mem_caches();
            }
--- a/web/vendor/symfony/class-loader/phpunit.xml.dist
+++ b/web/vendor/symfony/class-loader/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/console/Application.php
+++ b/web/vendor/symfony/console/Application.php
@ -16,6 +16,7 @@ use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Exception\ExceptionInterface;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
+use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
@ -106,6 +107,8 @@ class Application
     * @param OutputInterface $output An Output instance
     *
     * @return int 0 if everything went fine, or an error code
+     *
+     * @throws \Exception When running fails. Bypass this when {@link setCatchExceptions()}.
     */
    public function run(InputInterface $input = null, OutputInterface $output = null)
    {
@ -120,10 +123,17 @@ class Application
        $this->configureIO($input, $output);

        try {
+            $e = null;
            $exitCode = $this->doRun($input, $output);
-        } catch (\Exception $e) {
-            if (!$this->catchExceptions) {
-                throw $e;
+        } catch (\Exception $x) {
+            $e = $x;
+        } catch (\Throwable $x) {
+            $e = new FatalThrowableError($x);
+        }
+
+        if (null !== $e) {
+            if (!$this->catchExceptions || !$x instanceof \Exception) {
+                throw $x;
            }

            if ($output instanceof ConsoleOutputInterface) {
@ -185,6 +195,7 @@ class Application
            $input = new ArrayInput(array('command' => $this->defaultCommand));
        }

+        $this->runningCommand = null;
        // the command name MUST be the first element of the input
        $command = $this->find($name);

@ -646,7 +657,7 @@ class Application
        do {
            $title = sprintf('  [%s]  ', get_class($e));

-            $len = $this->stringWidth($title);
+            $len = Helper::strlen($title);

            $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
            // HHVM only accepts 32 bits integer in str_split, even when PHP_INT_MAX is a 64 bit integer: https://github.com/facebook/hhvm/issues/1327
@ -657,7 +668,7 @@ class Application
            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
                foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                    // pre-format lines to get the right string length
-                    $lineLength = $this->stringWidth($line) + 4;
+                    $lineLength = Helper::strlen($line) + 4;
                    $lines[] = array($line, $lineLength);

                    $len = max($lineLength, $len);
@ -666,7 +677,7 @@ class Application

            $messages = array();
            $messages[] = $emptyLine = sprintf('<error>%s</error>', str_repeat(' ', $len));
-            $messages[] = sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title))));
+            $messages[] = sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - Helper::strlen($title))));
            foreach ($lines as $line) {
                $messages[] = sprintf('<error>  %s  %s</error>', OutputFormatter::escape($line[0]), str_repeat(' ', $len - $line[1]));
            }
@ -842,13 +853,7 @@ class Application
        }

        if (null === $this->dispatcher) {
-            try {
-                return $command->run($input, $output);
-            } catch (\Exception $e) {
-                throw $e;
-            } catch (\Throwable $e) {
-                throw new FatalThrowableError($e);
-            }
+            return $command->run($input, $output);
        }

        // bind before the console.command event, so the listeners have access to input options/arguments
@ -860,37 +865,37 @@ class Application
        }

        $event = new ConsoleCommandEvent($command, $input, $output);
-        $this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
+        $e = null;

-        if ($event->commandShouldRun()) {
-            try {
-                $e = null;
+        try {
+            $this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
+
+            if ($event->commandShouldRun()) {
                $exitCode = $command->run($input, $output);
-            } catch (\Exception $x) {
-                $e = $x;
-            } catch (\Throwable $x) {
-                $e = new FatalThrowableError($x);
+            } else {
+                $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
            }
-            if (null !== $e) {
-                $event = new ConsoleExceptionEvent($command, $input, $output, $e, $e->getCode());
-                $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+        if (null !== $e) {
+            $x = $e instanceof \Exception ? $e : new FatalThrowableError($e);
+            $event = new ConsoleExceptionEvent($command, $input, $output, $x, $x->getCode());
+            $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);

-                if ($e !== $event->getException()) {
-                    $x = $e = $event->getException();
-                }
-
-                $event = new ConsoleTerminateEvent($command, $input, $output, $e->getCode());
-                $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
-
-                throw $x;
+            if ($x !== $event->getException()) {
+                $e = $event->getException();
            }
-        } else {
-            $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
+            $exitCode = $e->getCode();
        }

        $event = new ConsoleTerminateEvent($command, $input, $output, $exitCode);
        $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);

+        if (null !== $e) {
+            throw $e;
+        }
+
        return $event->getExitCode();
    }

@ -1093,15 +1098,6 @@ class Application
        $this->defaultCommand = $commandName;
    }

-    private function stringWidth($string)
-    {
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return strlen($string);
-        }
-
-        return mb_strwidth($string, $encoding);
-    }
-
    private function splitStringByWidth($string, $width)
    {
        // str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly.
--- a/web/vendor/symfony/console/Command/Command.php
+++ b/web/vendor/symfony/console/Command/Command.php
@ -205,6 +205,8 @@ class Command
     *
     * @return int The command exit code
     *
+     * @throws \Exception When binding input fails. Bypass this by calling {@link ignoreValidationErrors()}.
+     *
     * @see setCode()
     * @see execute()
     */
--- a/web/vendor/symfony/console/Descriptor/TextDescriptor.php
+++ b/web/vendor/symfony/console/Descriptor/TextDescriptor.php
@ -247,7 +247,7 @@ class TextDescriptor extends Descriptor
            }
        }

-        if (PHP_VERSION_ID < 50400) {
+        if (\PHP_VERSION_ID < 50400) {
            return str_replace(array('\/', '\\\\'), array('/', '\\'), json_encode($default));
        }

--- a/web/vendor/symfony/console/Formatter/OutputFormatter.php
+++ b/web/vendor/symfony/console/Formatter/OutputFormatter.php
@ -81,9 +81,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Sets the decorated flag.
-     *
-     * @param bool $decorated Whether to decorate the messages or not
+     * {@inheritdoc}
     */
    public function setDecorated($decorated)
    {
@ -91,9 +89,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Gets the decorated flag.
-     *
-     * @return bool true if the output will decorate messages, false otherwise
+     * {@inheritdoc}
     */
    public function isDecorated()
    {
@ -101,10 +97,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Sets a new style.
-     *
-     * @param string                        $name  The style name
-     * @param OutputFormatterStyleInterface $style The style instance
+     * {@inheritdoc}
     */
    public function setStyle($name, OutputFormatterStyleInterface $style)
    {
@ -112,11 +105,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Checks if output formatter has style with specified name.
-     *
-     * @param string $name
-     *
-     * @return bool
+     * {@inheritdoc}
     */
    public function hasStyle($name)
    {
@ -124,13 +113,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Gets style options from style with specified name.
-     *
-     * @param string $name
-     *
-     * @return OutputFormatterStyleInterface
-     *
-     * @throws InvalidArgumentException When style isn't defined
+     * {@inheritdoc}
     */
    public function getStyle($name)
    {
@ -142,11 +125,7 @@ class OutputFormatter implements OutputFormatterInterface
    }

    /**
-     * Formats a message according to the given styles.
-     *
-     * @param string $message The message to style
-     *
-     * @return string The styled message
+     * {@inheritdoc}
     */
    public function format($message)
    {
--- a/web/vendor/symfony/console/Formatter/OutputFormatterInterface.php
+++ b/web/vendor/symfony/console/Formatter/OutputFormatterInterface.php
@ -55,6 +55,8 @@ interface OutputFormatterInterface
     * @param string $name
     *
     * @return OutputFormatterStyleInterface
+     *
+     * @throws \InvalidArgumentException When style isn't defined
     */
    public function getStyle($name);

--- a/web/vendor/symfony/console/Helper/Table.php
+++ b/web/vendor/symfony/console/Helper/Table.php
@ -149,7 +149,7 @@ class Table
     */
    public function setColumnStyle($columnIndex, $name)
    {
-        $columnIndex = intval($columnIndex);
+        $columnIndex = (int) $columnIndex;

        $this->columnStyles[$columnIndex] = $this->resolveStyle($name);

--- a/web/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/web/vendor/symfony/console/Question/ChoiceQuestion.php
@ -34,6 +34,10 @@ class ChoiceQuestion extends Question
     */
    public function __construct($question, array $choices, $default = null)
    {
+        if (!$choices) {
+            throw new \LogicException('Choice question must have at least 1 choice available.');
+        }
+
        parent::__construct($question, $default);

        $this->choices = $choices;
@ -137,7 +141,7 @@ class ChoiceQuestion extends Question

            if ($multiselect) {
                // Check for a separated comma values
-                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
+                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selectedChoices, $matches)) {
                    throw new InvalidArgumentException(sprintf($errorMessage, $selected));
                }
                $selectedChoices = explode(',', $selectedChoices);
--- a/web/vendor/symfony/console/phpunit.xml.dist
+++ b/web/vendor/symfony/console/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/debug/DebugClassLoader.php
+++ b/web/vendor/symfony/debug/DebugClassLoader.php
@ -186,7 +186,7 @@ class DebugClassLoader

        $exists = class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false));

-        if ('\\' === $class[0]) {
+        if ($class && '\\' === $class[0]) {
            $class = substr($class, 1);
        }

--- a/web/vendor/symfony/debug/ErrorHandler.php
+++ b/web/vendor/symfony/debug/ErrorHandler.php
@ -103,6 +103,7 @@ class ErrorHandler
    private static $stackedErrors = array();
    private static $stackedErrorLevels = array();
    private static $toStringException = null;
+    private static $exitCode = 0;

    /**
     * Same init value as thrownErrors.
@ -432,7 +433,7 @@ class ErrorHandler
                $throw = new \ErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line);
            }

-            if (PHP_VERSION_ID <= 50407 && (PHP_VERSION_ID >= 50400 || PHP_VERSION_ID <= 50317)) {
+            if (\PHP_VERSION_ID <= 50407 && (\PHP_VERSION_ID >= 50400 || \PHP_VERSION_ID <= 50317)) {
                // Exceptions thrown from error handlers are sometimes not caught by the exception
                // handler and shutdown handlers are bypassed before 5.4.8/5.3.18.
                // We temporarily re-enable display_errors to prevent any blank page related to this bug.
@ -547,6 +548,9 @@ class ErrorHandler
     */
    public function handleException($exception, array $error = null)
    {
+        if (null === $error) {
+            self::$exitCode = 255;
+        }
        if (!$exception instanceof \Exception) {
            $exception = new FatalThrowableError($exception);
        }
@ -632,7 +636,7 @@ class ErrorHandler
            return;
        }

-        if (null === $error) {
+        if ($exit = null === $error) {
            $error = error_get_last();
        }

@ -656,15 +660,21 @@ class ErrorHandler
            } else {
                $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
            }
-        } elseif (!isset($exception)) {
-            return;
        }

        try {
-            $handler->handleException($exception, $error);
+            if (isset($exception)) {
+                self::$exitCode = 255;
+                $handler->handleException($exception, $error);
+            }
        } catch (FatalErrorException $e) {
            // Ignore this re-throw
        }
+
+        if ($exit && self::$exitCode) {
+            $exitCode = self::$exitCode;
+            register_shutdown_function('register_shutdown_function', function () use ($exitCode) { exit($exitCode); });
+        }
    }

    /**
--- a/web/vendor/symfony/debug/ExceptionHandler.php
+++ b/web/vendor/symfony/debug/ExceptionHandler.php
@ -457,7 +457,7 @@ EOF;
    {
        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);

-        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
+        return htmlspecialchars($str, ENT_QUOTES | (\PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
    }

    /**
@ -465,7 +465,7 @@ EOF;
     */
    private function escapeHtml($str)
    {
-        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), $this->charset);
+        return htmlspecialchars($str, ENT_QUOTES | (\PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), $this->charset);
    }

    /**
--- a/web/vendor/symfony/debug/phpunit.xml.dist
+++ b/web/vendor/symfony/debug/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
+++ b/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
@ -116,7 +116,8 @@ class AutowirePass implements CompilerPassInterface
                }

                if (isset($this->autowired[$typeHint->name])) {
-                    return $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
+                    $arguments[$index] = $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
+                    continue;
                }

                if (null === $this->types) {
@ -303,9 +304,28 @@ class AutowirePass implements CompilerPassInterface

        $class = $this->container->getParameterBag()->resolveValue($class);

+        if ($deprecated = $definition->isDeprecated()) {
+            $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
+                return (E_USER_DEPRECATED === $level || !$prevErrorHandler) ? false : $prevErrorHandler($level, $message, $file, $line);
+            });
+        }
+
+        $e = null;
+
        try {
            $reflector = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+
+        if ($deprecated) {
+            restore_error_handler();
+        }
+
+        if (null !== $e) {
+            if (!$e instanceof \ReflectionException) {
+                throw $e;
+            }
            $reflector = false;
        }

--- a/web/vendor/symfony/dependency-injection/Definition.php
+++ b/web/vendor/symfony/dependency-injection/Definition.php
@ -29,7 +29,7 @@ class Definition
    private $factoryService;
    private $shared = true;
    private $deprecated = false;
-    private $deprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.';
+    private $deprecationTemplate;
    private $scope = ContainerInterface::SCOPE_CONTAINER;
    private $properties = array();
    private $calls = array();
@ -44,6 +44,8 @@ class Definition
    private $autowired = false;
    private $autowiringTypes = array();

+    private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.';
+
    protected $arguments;

    /**
@ -379,7 +381,7 @@ class Definition
    public function addMethodCall($method, array $arguments = array())
    {
        if (empty($method)) {
-            throw new InvalidArgumentException(sprintf('Method name cannot be empty.'));
+            throw new InvalidArgumentException('Method name cannot be empty.');
        }
        $this->calls[] = array($method, $arguments);

@ -796,7 +798,7 @@ class Definition
     */
    public function getDeprecationMessage($id)
    {
-        return str_replace('%service_id%', $id, $this->deprecationTemplate);
+        return str_replace('%service_id%', $id, $this->deprecationTemplate ?: self::$defaultDeprecationTemplate);
    }

    /**
--- a/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
@ -847,7 +847,7 @@ EOF;
    private function startClass($class, $baseClass, $namespace)
    {
        $bagClass = $this->container->isFrozen() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';
-        $namespaceLine = $namespace ? "namespace $namespace;\n" : '';
+        $namespaceLine = $namespace ? "\nnamespace $namespace;\n" : '';

        return <<<EOF
 <?php
@ -1351,9 +1351,12 @@ EOF;
            if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
                return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);
            }
-            if (count($value->getMethodCalls()) > 0) {
+            if ($value->getMethodCalls()) {
                throw new RuntimeException('Cannot dump definitions which have method calls.');
            }
+            if ($value->getProperties()) {
+                throw new RuntimeException('Cannot dump definitions which have properties.');
+            }
            if (null !== $value->getConfigurator()) {
                throw new RuntimeException('Cannot dump definitions which have a configurator.');
            }
--- a/web/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
+++ b/web/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
@ -215,6 +215,10 @@ class XmlDumper extends Dumper
            $service->appendChild($autowiringType);
        }

+        if ($definition->isAbstract()) {
+            $service->setAttribute('abstract', 'true');
+        }
+
        if ($callable = $definition->getConfigurator()) {
            $configurator = $this->document->createElement('configurator');

--- a/web/vendor/symfony/dependency-injection/Dumper/YamlDumper.php
+++ b/web/vendor/symfony/dependency-injection/Dumper/YamlDumper.php
@ -93,11 +93,11 @@ class YamlDumper extends Dumper
        }

        if ($definition->isSynthetic()) {
-            $code .= sprintf("        synthetic: true\n");
+            $code .= "        synthetic: true\n";
        }

        if ($definition->isSynchronized(false)) {
-            $code .= sprintf("        synchronized: true\n");
+            $code .= "        synchronized: true\n";
        }

        if ($definition->isDeprecated()) {
@ -121,7 +121,7 @@ class YamlDumper extends Dumper
        }

        if ($definition->isLazy()) {
-            $code .= sprintf("        lazy: true\n");
+            $code .= "        lazy: true\n";
        }

        if ($definition->getFactoryMethod(false)) {
--- a/web/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd
+++ b/web/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd
@ -145,8 +145,8 @@
  </xsd:complexType>

  <xsd:complexType name="property" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
+    <xsd:choice minOccurs="0">
+      <xsd:element name="property" type="property" maxOccurs="unbounded" />
      <xsd:element name="service" type="service" />
    </xsd:choice>
    <xsd:attribute name="type" type="argument_type" />
@ -158,8 +158,8 @@
  </xsd:complexType>

  <xsd:complexType name="argument" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
+    <xsd:choice minOccurs="0">
+      <xsd:element name="argument" type="argument" maxOccurs="unbounded" />
      <xsd:element name="service" type="service" />
    </xsd:choice>
    <xsd:attribute name="type" type="argument_type" />
@ -170,10 +170,9 @@
    <xsd:attribute name="strict" type="boolean" />
  </xsd:complexType>

-  <xsd:complexType name="call" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
+  <xsd:complexType name="call">
+    <xsd:choice minOccurs="0">
+      <xsd:element name="argument" type="argument" maxOccurs="unbounded" />
    </xsd:choice>
    <xsd:attribute name="method" type="xsd:string" />
  </xsd:complexType>
--- a/web/vendor/symfony/dependency-injection/phpunit.xml.dist
+++ b/web/vendor/symfony/dependency-injection/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
+++ b/web/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
@ -105,7 +105,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
    public function hasListeners($eventName = null)
    {
        if (null === $eventName) {
-            return (bool) count($this->listenerIds) || (bool) count($this->listeners);
+            return $this->listenerIds || $this->listeners || parent::hasListeners();
        }

        if (isset($this->listenerIds[$eventName])) {
--- a/web/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
+++ b/web/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
@ -306,6 +306,12 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
            'event' => $eventName,
            'priority' => $this->getListenerPriority($eventName, $listener),
        );
+
+        // unwrap for correct listener info
+        if ($listener instanceof WrappedListener) {
+            $listener = $listener->getWrappedListener();
+        }
+
        if ($listener instanceof \Closure) {
            $info += array(
                'type' => 'Closure',
--- a/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@ -56,6 +56,7 @@ abstract class AbstractEventDispatcherTest extends TestCase
    {
        $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo'));
        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
+        $this->assertTrue($this->dispatcher->hasListeners());
        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
        $this->assertCount(1, $this->dispatcher->getListeners(self::preFoo));
--- a/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@ -13,6 +13,7 @@ namespace Symfony\Component\EventDispatcher\Tests\Debug;

 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\Debug\WrappedListener;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@ -100,21 +101,41 @@ class TraceableEventDispatcherTest extends TestCase
        $this->assertCount(0, $dispatcher->getListeners('foo'));
    }

-    public function testGetCalledListeners()
+    /**
+     * @dataProvider isWrappedDataProvider
+     *
+     * @param bool $isWrapped
+     */
+    public function testGetCalledListeners($isWrapped)
    {
        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-        $tdispatcher->addListener('foo', $listener = function () {});
+        $stopWatch = new Stopwatch();
+        $tdispatcher = new TraceableEventDispatcher($dispatcher, $stopWatch);
+
+        $listener = function () {};
+        if ($isWrapped) {
+            $listener = new WrappedListener($listener, 'foo', $stopWatch, $dispatcher);
+        }
+
+        $tdispatcher->addListener('foo', $listener, 5);

        $this->assertEquals(array(), $tdispatcher->getCalledListeners());
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 0)), $tdispatcher->getNotCalledListeners());
+        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getNotCalledListeners());

        $tdispatcher->dispatch('foo');

-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => null)), $tdispatcher->getCalledListeners());
+        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getCalledListeners());
        $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
    }

+    public function isWrappedDataProvider()
+    {
+        return array(
+            array(false),
+            array(true),
+        );
+    }
+
    public function testGetCalledListenersNested()
    {
        $tdispatcher = null;
--- a/web/vendor/symfony/event-dispatcher/phpunit.xml.dist
+++ b/web/vendor/symfony/event-dispatcher/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/http-foundation/FileBag.php
+++ b/web/vendor/symfony/http-foundation/FileBag.php
@ -69,7 +69,7 @@ class FileBag extends ParameterBag
     *
     * @param array|UploadedFile $file A (multi-dimensional) array of uploaded file information
     *
-     * @return array A (multi-dimensional) array of UploadedFile instances
+     * @return UploadedFile|UploadedFile[] A (multi-dimensional) array of UploadedFile instances
     */
    protected function convertFileInformation($file)
    {
--- a/web/vendor/symfony/http-foundation/JsonResponse.php
+++ b/web/vendor/symfony/http-foundation/JsonResponse.php
@ -121,7 +121,7 @@ class JsonResponse extends Response
            $data = json_encode($data, $this->encodingOptions);
        } else {
            try {
-                if (PHP_VERSION_ID < 50400) {
+                if (\PHP_VERSION_ID < 50400) {
                    // PHP 5.3 triggers annoying warnings for some
                    // types that can't be serialized as JSON (INF, resources, etc.)
                    // but doesn't provide the JsonSerializable interface.
@ -131,7 +131,7 @@ class JsonResponse extends Response
                    // PHP 5.4 and up wrap exceptions thrown by JsonSerializable
                    // objects in a new exception that needs to be removed.
                    // Fortunately, PHP 5.5 and up do not trigger any warning anymore.
-                    if (PHP_VERSION_ID < 50500) {
+                    if (\PHP_VERSION_ID < 50500) {
                        // Clear json_last_error()
                        json_encode(null);
                        $errorHandler = set_error_handler('var_dump');
@ -146,14 +146,14 @@ class JsonResponse extends Response
                    $data = json_encode($data, $this->encodingOptions);
                }

-                if (PHP_VERSION_ID < 50500) {
+                if (\PHP_VERSION_ID < 50500) {
                    restore_error_handler();
                }
            } catch (\Exception $e) {
-                if (PHP_VERSION_ID < 50500) {
+                if (\PHP_VERSION_ID < 50500) {
                    restore_error_handler();
                }
-                if (PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+                if (\PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
                    throw $e->getPrevious() ?: $e;
                }
                throw $e;
--- a/web/vendor/symfony/http-foundation/ParameterBag.php
+++ b/web/vendor/symfony/http-foundation/ParameterBag.php
@ -135,7 +135,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
        }

        if (null !== $currentKey) {
-            throw new \InvalidArgumentException(sprintf('Malformed path. Path must end with "]".'));
+            throw new \InvalidArgumentException('Malformed path. Path must end with "]".');
        }

        return $value;
--- a/web/vendor/symfony/http-foundation/Request.php
+++ b/web/vendor/symfony/http-foundation/Request.php
@ -837,7 +837,7 @@ class Request
     * ("Client-Ip" for instance), configure it via "setTrustedHeaderName()" with
     * the "client-ip" key.
     *
-     * @return string The client IP address
+     * @return string|null The client IP address
     *
     * @see getClientIps()
     * @see http://en.wikipedia.org/wiki/X-Forwarded-For
@ -943,7 +943,7 @@ class Request
     * If your reverse proxy uses a different header name than "X-Forwarded-Port",
     * configure it via "setTrustedHeaderName()" with the "client-port" key.
     *
-     * @return string
+     * @return int|string can be a string if fetched from the server bag
     */
    public function getPort()
    {
@ -1481,7 +1481,7 @@ class Request
    public function getContent($asResource = false)
    {
        $currentContentIsResource = is_resource($this->content);
-        if (PHP_VERSION_ID < 50600 && false === $this->content) {
+        if (\PHP_VERSION_ID < 50600 && false === $this->content) {
            throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
        }

--- a/web/vendor/symfony/http-foundation/Response.php
+++ b/web/vendor/symfony/http-foundation/Response.php
@ -179,7 +179,7 @@ class Response
        503 => 'Service Unavailable',
        504 => 'Gateway Timeout',
        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
+        506 => 'Variant Also Negotiates',                                     // RFC2295
        507 => 'Insufficient Storage',                                        // RFC4918
        508 => 'Loop Detected',                                               // RFC5842
        510 => 'Not Extended',                                                // RFC2774
@ -204,7 +204,7 @@ class Response

        /* RFC2616 - 14.18 says all Responses need to have a Date */
        if (!$this->headers->has('Date')) {
-            $this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
+            $this->setDate(\DateTime::createFromFormat('U', time()));
        }
    }

--- a/web/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
+++ b/web/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
@ -13,7 +13,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

 // Adds SessionHandler functionality if available.
 // @see http://php.net/sessionhandler
-if (PHP_VERSION_ID >= 50400) {
+if (\PHP_VERSION_ID >= 50400) {
    class NativeSessionHandler extends \SessionHandler
    {
    }
--- a/web/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/web/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@ -81,6 +81,7 @@ class NativeSessionStorage implements SessionStorageInterface
     * name, "PHPSESSID"
     * referer_check, ""
     * serialize_handler, "php"
+     * use_strict_mode, "0"
     * use_cookies, "1"
     * use_only_cookies, "1"
     * use_trans_sid, "0"
@ -127,11 +128,11 @@ class NativeSessionStorage implements SessionStorageInterface
            return true;
        }

-        if (PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status()) {
+        if (\PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status()) {
            throw new \RuntimeException('Failed to start the session: already started by PHP.');
        }

-        if (PHP_VERSION_ID < 50400 && !$this->closed && isset($_SESSION) && session_id()) {
+        if (\PHP_VERSION_ID < 50400 && !$this->closed && isset($_SESSION) && session_id()) {
            // not 100% fool-proof, but is the most reliable way to determine if a session is active in PHP 5.3
            throw new \RuntimeException('Failed to start the session: already started by PHP ($_SESSION is set).');
        }
@ -192,12 +193,12 @@ class NativeSessionStorage implements SessionStorageInterface
    public function regenerate($destroy = false, $lifetime = null)
    {
        // Cannot regenerate the session ID for non-active sessions.
-        if (PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE !== session_status()) {
+        if (\PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE !== session_status()) {
            return false;
        }

        // Check if session ID exists in PHP 5.3
-        if (PHP_VERSION_ID < 50400 && '' === session_id()) {
+        if (\PHP_VERSION_ID < 50400 && '' === session_id()) {
            return false;
        }

@ -331,7 +332,7 @@ class NativeSessionStorage implements SessionStorageInterface
            'entropy_file', 'entropy_length', 'gc_divisor',
            'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character',
            'hash_function', 'name', 'referer_check',
-            'serialize_handler', 'use_cookies',
+            'serialize_handler', 'use_strict_mode', 'use_cookies',
            'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled',
            'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
            'upload_progress.freq', 'upload_progress.min-freq', 'url_rewriter.tags',
@ -379,13 +380,13 @@ class NativeSessionStorage implements SessionStorageInterface
        if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
            $saveHandler = new SessionHandlerProxy($saveHandler);
        } elseif (!$saveHandler instanceof AbstractProxy) {
-            $saveHandler = PHP_VERSION_ID >= 50400 ?
+            $saveHandler = \PHP_VERSION_ID >= 50400 ?
                new SessionHandlerProxy(new \SessionHandler()) : new NativeProxy();
        }
        $this->saveHandler = $saveHandler;

        if ($this->saveHandler instanceof \SessionHandlerInterface) {
-            if (PHP_VERSION_ID >= 50400) {
+            if (\PHP_VERSION_ID >= 50400) {
                session_set_save_handler($this->saveHandler, false);
            } else {
                session_set_save_handler(
--- a/web/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/web/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
@ -72,7 +72,7 @@ abstract class AbstractProxy
     */
    public function isActive()
    {
-        if (PHP_VERSION_ID >= 50400) {
+        if (\PHP_VERSION_ID >= 50400) {
            return $this->active = \PHP_SESSION_ACTIVE === session_status();
        }

@ -93,7 +93,7 @@ abstract class AbstractProxy
     */
    public function setActive($flag)
    {
-        if (PHP_VERSION_ID >= 50400) {
+        if (\PHP_VERSION_ID >= 50400) {
            throw new \LogicException('This method is disabled in PHP 5.4.0+');
        }

--- a/web/vendor/symfony/http-foundation/phpunit.xml.dist
+++ b/web/vendor/symfony/http-foundation/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/http-kernel/Bundle/Bundle.php
+++ b/web/vendor/symfony/http-kernel/Bundle/Bundle.php
@ -141,7 +141,7 @@ abstract class Bundle implements BundleInterface
    /**
     * Returns the bundle parent name.
     *
-     * @return string The Bundle parent name it overrides or null if no parent
+     * @return string|null The Bundle parent name it overrides or null if no parent
     */
    public function getParent()
    {
--- a/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
@ -20,6 +20,7 @@ use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+use Twig\Template;

 /**
 * @author Nicolas Grekas <p@tchwork.com>
@ -71,7 +72,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
        }

        $trace = DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS;
-        if (PHP_VERSION_ID >= 50400) {
+        if (\PHP_VERSION_ID >= 50400) {
            $trace = debug_backtrace($trace, 7);
        } else {
            $trace = debug_backtrace($trace);
@ -96,7 +97,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
                        $line = $trace[$i]['line'];

                        break;
-                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
+                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof Template) {
                        $template = $trace[$i]['object'];
                        $name = $template->getTemplateName();
                        $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
@ -263,7 +264,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface

    private function doDump($data, $name, $file, $line)
    {
-        if (PHP_VERSION_ID >= 50400 && $this->dumper instanceof CliDumper) {
+        if (\PHP_VERSION_ID >= 50400 && $this->dumper instanceof CliDumper) {
            $contextDumper = function ($name, $file, $line, $fileLinkFormat) {
                if ($this instanceof HtmlDumper) {
                    if ($file) {
--- a/web/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/web/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@ -16,6 +16,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\UriSigner;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Loader\ExistsLoaderInterface;

 /**
 * Implements the Hinclude rendering strategy.
@ -32,10 +35,10 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
    /**
     * Constructor.
     *
-     * @param EngineInterface|\Twig_Environment $templating            An EngineInterface or a \Twig_Environment instance
-     * @param UriSigner                         $signer                A UriSigner instance
-     * @param string                            $globalDefaultTemplate The global default content (it can be a template name or the content)
-     * @param string                            $charset
+     * @param EngineInterface|Environment $templating            An EngineInterface or a Twig instance
+     * @param UriSigner                   $signer                A UriSigner instance
+     * @param string                      $globalDefaultTemplate The global default content (it can be a template name or the content)
+     * @param string                      $charset
     */
    public function __construct($templating = null, UriSigner $signer = null, $globalDefaultTemplate = null, $charset = 'utf-8')
    {
@ -48,14 +51,14 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
    /**
     * Sets the templating engine to use to render the default content.
     *
-     * @param EngineInterface|\Twig_Environment|null $templating An EngineInterface or a \Twig_Environment instance
+     * @param EngineInterface|Environment|null $templating An EngineInterface or an Environment instance
     *
     * @throws \InvalidArgumentException
     */
    public function setTemplating($templating)
    {
-        if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof \Twig_Environment) {
-            throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of \Twig_Environment or Symfony\Component\Templating\EngineInterface');
+        if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof Environment) {
+            throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface');
        }

        $this->templating = $templating;
@ -107,7 +110,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
        }
        $renderedAttributes = '';
        if (count($attributes) > 0) {
-            if (PHP_VERSION_ID >= 50400) {
+            if (\PHP_VERSION_ID >= 50400) {
                $flags = ENT_QUOTES | ENT_SUBSTITUTE;
            } else {
                $flags = ENT_QUOTES;
@ -140,7 +143,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
        }

        $loader = $this->templating->getLoader();
-        if ($loader instanceof \Twig_ExistsLoaderInterface || method_exists($loader, 'exists')) {
+        if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
            return $loader->exists($template);
        }

@ -152,7 +155,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
            }

            return true;
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
        }

        return false;
--- a/web/vendor/symfony/http-kernel/Kernel.php
+++ b/web/vendor/symfony/http-kernel/Kernel.php
@ -59,11 +59,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
    protected $startTime;
    protected $loadClassCache;

-    const VERSION = '2.8.19';
-    const VERSION_ID = 20819;
+    const VERSION = '2.8.22';
+    const VERSION_ID = 20822;
    const MAJOR_VERSION = 2;
    const MINOR_VERSION = 8;
-    const RELEASE_VERSION = 19;
+    const RELEASE_VERSION = 22;
    const EXTRA_VERSION = '';

    const END_OF_MAINTENANCE = '11/2018';
@ -755,7 +755,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface

        $output .= $rawChunk;

-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
            unset($tokens, $rawChunk);
            gc_mem_caches();
--- a/web/vendor/symfony/http-kernel/Profiler/Profile.php
+++ b/web/vendor/symfony/http-kernel/Profiler/Profile.php
@ -156,7 +156,7 @@ class Profile
    /**
     * Returns the time.
     *
-     * @return string The time
+     * @return int The time
     */
    public function getTime()
    {
@ -167,6 +167,9 @@ class Profile
        return $this->time;
    }

+    /**
+     * @param int The time
+     */
    public function setTime($time)
    {
        $this->time = $time;
--- a/web/vendor/symfony/http-kernel/composer.json
+++ b/web/vendor/symfony/http-kernel/composer.json
@ -40,7 +40,8 @@
        "symfony/var-dumper": "~2.6|~3.0.0"
    },
    "conflict": {
-        "symfony/config": "<2.7"
+        "symfony/config": "<2.7",
+        "twig/twig": "<1.34|<2.4,>=2"
    },
    "suggest": {
        "symfony/browser-kit": "",
--- a/web/vendor/symfony/http-kernel/phpunit.xml.dist
+++ b/web/vendor/symfony/http-kernel/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/polyfill-apcu/bootstrap.php
+++ b/web/vendor/symfony/polyfill-apcu/bootstrap.php
@ -9,7 +9,7 @@
 * file that was distributed with this source code.
 */

-if (!extension_loaded('apc')) {
+if (!extension_loaded('apc') && !extension_loaded('apcu')) {
    return;
 }

--- a/web/vendor/symfony/polyfill-apcu/composer.json
+++ b/web/vendor/symfony/polyfill-apcu/composer.json
@ -24,7 +24,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
        }
    }
 }
--- a/web/vendor/symfony/polyfill-iconv/composer.json
+++ b/web/vendor/symfony/polyfill-iconv/composer.json
@ -28,7 +28,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
        }
    }
 }
--- a/web/vendor/symfony/polyfill-mbstring/Mbstring.php
+++ b/web/vendor/symfony/polyfill-mbstring/Mbstring.php
@ -147,6 +147,9 @@ final class Mbstring

        if ('UTF-8' === $encoding) {
            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
        } else {
            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
        }
@ -336,10 +339,9 @@ final class Mbstring

    public static function mb_strlen($s, $encoding = null)
    {
-        switch ($encoding = self::getEncoding($encoding)) {
-            case 'ASCII':
-            case 'CP850':
-                return strlen($s);
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strlen($s);
        }

        return @iconv_strlen($s, $encoding);
@ -348,6 +350,9 @@ final class Mbstring
    public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
    {
        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strpos($haystack, $needle, $offset);
+        }

        if ('' === $needle .= '') {
            trigger_error(__METHOD__.': Empty delimiter', E_USER_WARNING);
@ -361,6 +366,9 @@ final class Mbstring
    public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null)
    {
        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strrpos($haystack, $needle, $offset);
+        }

        if ($offset != (int) $offset) {
            $offset = 0;
@ -400,6 +408,9 @@ final class Mbstring
    public static function mb_substr($s, $start, $length = null, $encoding = null)
    {
        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return substr($s, $start, null === $length ? 2147483647 : $length);
+        }

        if ($start < 0) {
            $start = iconv_strlen($s, $encoding) + $start;
@ -438,6 +449,9 @@ final class Mbstring
    public static function mb_strrchr($haystack, $needle, $part = false, $encoding = null)
    {
        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strrchr($haystack, $needle, $part);
+        }
        $needle = self::mb_substr($needle, 0, 1, $encoding);
        $pos = iconv_strrpos($haystack, $needle, $encoding);

--- a/web/vendor/symfony/polyfill-mbstring/composer.json
+++ b/web/vendor/symfony/polyfill-mbstring/composer.json
@ -28,7 +28,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
        }
    }
 }
--- a/web/vendor/symfony/polyfill-php54/composer.json
+++ b/web/vendor/symfony/polyfill-php54/composer.json
@ -26,7 +26,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
        }
    }
 }
--- a/web/vendor/symfony/polyfill-php55/composer.json
+++ b/web/vendor/symfony/polyfill-php55/composer.json
@ -26,7 +26,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
        }
    }
 }
--- a/web/vendor/symfony/process/phpunit.xml.dist
+++ b/web/vendor/symfony/process/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/routing/Loader/AnnotationFileLoader.php
+++ b/web/vendor/symfony/routing/Loader/AnnotationFileLoader.php
@ -64,7 +64,7 @@ class AnnotationFileLoader extends FileLoader
            $collection->addResource(new FileResource($path));
            $collection->addCollection($this->loader->load($class, $type));
        }
-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
            gc_mem_caches();
        }
--- a/web/vendor/symfony/routing/phpunit.xml.dist
+++ b/web/vendor/symfony/routing/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/serializer/Encoder/JsonDecode.php
+++ b/web/vendor/symfony/serializer/Encoder/JsonDecode.php
@ -101,7 +101,7 @@ class JsonDecode implements DecoderInterface
        $recursionDepth = $context['json_decode_recursion_depth'];
        $options = $context['json_decode_options'];

-        if (PHP_VERSION_ID >= 50400) {
+        if (\PHP_VERSION_ID >= 50400) {
            $decodedData = json_decode($data, $associative, $recursionDepth, $options);
        } else {
            $decodedData = json_decode($data, $associative, $recursionDepth);
--- a/web/vendor/symfony/serializer/Encoder/XmlEncoder.php
+++ b/web/vendor/symfony/serializer/Encoder/XmlEncoder.php
@ -301,11 +301,19 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
        $data = array();

        foreach ($node->attributes as $attr) {
-            if (ctype_digit($attr->nodeValue)) {
-                $data['@'.$attr->nodeName] = (int) $attr->nodeValue;
-            } else {
+            if (!is_numeric($attr->nodeValue)) {
                $data['@'.$attr->nodeName] = $attr->nodeValue;
+
+                continue;
            }
+
+            if (false !== $val = filter_var($attr->nodeValue, FILTER_VALIDATE_INT)) {
+                $data['@'.$attr->nodeName] = $val;
+
+                continue;
+            }
+
+            $data['@'.$attr->nodeName] = (float) $attr->nodeValue;
        }

        return $data;
@ -460,7 +468,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
     */
    private function needsCdataWrapping($val)
    {
-        return preg_match('/[<>&]/', $val);
+        return 0 < preg_match('/[<>&]/', $val);
    }

    /**
--- a/web/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
+++ b/web/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
@ -208,10 +208,22 @@ class ObjectNormalizer extends AbstractNormalizer

            if (0 === strpos($name, 'get') || 0 === strpos($name, 'has')) {
                // getters and hassers
-                $attributes[lcfirst(substr($name, 3))] = true;
+                $propertyName = substr($name, 3);
+
+                if (!$reflClass->hasProperty($propertyName)) {
+                    $propertyName = lcfirst($propertyName);
+                }
+
+                $attributes[$propertyName] = true;
            } elseif (strpos($name, 'is') === 0) {
                // issers
-                $attributes[lcfirst(substr($name, 2))] = true;
+                $propertyName = substr($name, 2);
+
+                if (!$reflClass->hasProperty($propertyName)) {
+                    $propertyName = lcfirst($propertyName);
+                }
+
+                $attributes[$propertyName] = true;
            }
        }

--- a/web/vendor/symfony/serializer/phpunit.xml.dist
+++ b/web/vendor/symfony/serializer/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/translation/Translator.php
+++ b/web/vendor/symfony/translation/Translator.php
@ -424,7 +424,7 @@ EOF

        foreach ($this->computeFallbackLocales($locale) as $fallback) {
            if (!isset($this->catalogues[$fallback])) {
-                $this->loadCatalogue($fallback);
+                $this->initializeCatalogue($fallback);
            }

            $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
--- a/web/vendor/symfony/translation/phpunit.xml.dist
+++ b/web/vendor/symfony/translation/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/validator/Constraints/EmailValidator.php
+++ b/web/vendor/symfony/validator/Constraints/EmailValidator.php
@ -93,7 +93,7 @@ class EmailValidator extends ConstraintValidator
            return;
        }

-        $host = substr($value, strrpos($value, '@') + 1);
+        $host = (string) substr($value, strrpos($value, '@') + 1);

        // Check for host DNS resource records
        if ($constraint->checkMX) {
@ -138,7 +138,7 @@ class EmailValidator extends ConstraintValidator
     */
    private function checkMX($host)
    {
-        return checkdnsrr($host, 'MX');
+        return '' !== $host && checkdnsrr($host, 'MX');
    }

    /**
@ -150,6 +150,6 @@ class EmailValidator extends ConstraintValidator
     */
    private function checkHost($host)
    {
-        return $this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA'));
+        return '' !== $host && ($this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA')));
    }
 }
--- a/web/vendor/symfony/validator/Constraints/UrlValidator.php
+++ b/web/vendor/symfony/validator/Constraints/UrlValidator.php
@ -82,7 +82,7 @@ class UrlValidator extends ConstraintValidator
        if ($constraint->checkDNS) {
            $host = parse_url($value, PHP_URL_HOST);

-            if (!checkdnsrr($host, 'ANY')) {
+            if (!is_string($host) || !checkdnsrr($host, 'ANY')) {
                if ($this->context instanceof ExecutionContextInterface) {
                    $this->context->buildViolation($constraint->dnsMessage)
                        ->setParameter('{{ value }}', $this->formatValue($host))
--- a/web/vendor/symfony/validator/Validator.php
+++ b/web/vendor/symfony/validator/Validator.php
@ -151,7 +151,7 @@ class Validator implements ValidatorInterface, Mapping\Factory\MetadataFactoryIn
                ? '"'.$containingValue.'"'
                : 'the value of type '.gettype($containingValue);

-            throw new ValidatorException(sprintf('The metadata for '.$valueAsString.' does not support properties.'));
+            throw new ValidatorException(sprintf('The metadata for %s does not support properties.', $valueAsString));
        }

        // If $containingValue is passed as class name, take $value as root
--- a/web/vendor/symfony/validator/phpunit.xml.dist
+++ b/web/vendor/symfony/validator/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/symfony/yaml/Escaper.php
+++ b/web/vendor/symfony/yaml/Escaper.php
@ -33,13 +33,15 @@ class Escaper
                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
-                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9");
+                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
+                               );
    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
-                                     '\\N', '\\_', '\\L', '\\P');
+                                     '\\N', '\\_', '\\L', '\\P',
+                              );

    /**
     * Determines if a PHP value would require double quoting in YAML.
@ -50,7 +52,7 @@ class Escaper
     */
    public static function requiresDoubleQuoting($value)
    {
-        return preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
+        return 0 < preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
    }

    /**
@ -82,7 +84,7 @@ class Escaper

        // Determines if the PHP value contains any single characters that would
        // cause it to require single quoting in YAML.
-        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
+        return 0 < preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
    }

    /**
--- a/web/vendor/symfony/yaml/Exception/ParseException.php
+++ b/web/vendor/symfony/yaml/Exception/ParseException.php
@ -26,11 +26,11 @@ class ParseException extends RuntimeException
    /**
     * Constructor.
     *
-     * @param string     $message    The error message
-     * @param int        $parsedLine The line where the error occurred
-     * @param int        $snippet    The snippet of code near the problem
-     * @param string     $parsedFile The file name where the error occurred
-     * @param \Exception $previous   The previous exception
+     * @param string          $message    The error message
+     * @param int             $parsedLine The line where the error occurred
+     * @param string|null     $snippet    The snippet of code near the problem
+     * @param string|null     $parsedFile The file name where the error occurred
+     * @param \Exception|null $previous   The previous exception
     */
    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
    {
@ -123,7 +123,7 @@ class ParseException extends RuntimeException
        }

        if (null !== $this->parsedFile) {
-            if (PHP_VERSION_ID >= 50400) {
+            if (\PHP_VERSION_ID >= 50400) {
                $jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
            } else {
                $jsonOptions = 0;
--- a/web/vendor/symfony/yaml/Inline.php
+++ b/web/vendor/symfony/yaml/Inline.php
@ -212,12 +212,12 @@ class Inline
    /**
     * Parses a YAML scalar.
     *
-     * @param string $scalar
-     * @param string $delimiters
-     * @param array  $stringDelimiters
-     * @param int    &$i
-     * @param bool   $evaluate
-     * @param array  $references
+     * @param string   $scalar
+     * @param string[] $delimiters
+     * @param string[] $stringDelimiters
+     * @param int      &$i
+     * @param bool     $evaluate
+     * @param array    $references
     *
     * @return string
     *
@ -453,7 +453,7 @@ class Inline
     * @param string $scalar
     * @param array  $references
     *
-     * @return string A YAML string
+     * @return mixed The evaluated YAML string
     *
     * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
     */
--- a/web/vendor/symfony/yaml/Parser.php
+++ b/web/vendor/symfony/yaml/Parser.php
@ -64,23 +64,57 @@ class Parser
        if (false === preg_match('//u', $value)) {
            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
        }
-        $this->currentLineNb = -1;
-        $this->currentLine = '';
-        $value = $this->cleanup($value);
-        $this->lines = explode("\n", $value);

-        if (null === $this->totalNumberOfLines) {
-            $this->totalNumberOfLines = count($this->lines);
-        }
+        $this->refs = array();
+
+        $mbEncoding = null;
+        $e = null;
+        $data = null;

        if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) {
            $mbEncoding = mb_internal_encoding();
            mb_internal_encoding('UTF-8');
        }

+        try {
+            $data = $this->doParse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+
+        if (null !== $mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        $this->lines = array();
+        $this->currentLine = '';
+        $this->refs = array();
+        $this->skippedLineNumbers = array();
+        $this->locallySkippedLineNumbers = array();
+
+        if (null !== $e) {
+            throw $e;
+        }
+
+        return $data;
+    }
+
+    private function doParse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        $this->currentLineNb = -1;
+        $this->currentLine = '';
+        $value = $this->cleanup($value);
+        $this->lines = explode("\n", $value);
+        $this->locallySkippedLineNumbers = array();
+
+        if (null === $this->totalNumberOfLines) {
+            $this->totalNumberOfLines = count($this->lines);
+        }
+
        $data = array();
        $context = null;
        $allowOverwrite = false;
+
        while ($this->moveToNextLine()) {
            if ($this->isCurrentLineEmpty()) {
                continue;
@ -246,10 +280,6 @@ class Parser
                        throw $e;
                    }

-                    if (isset($mbEncoding)) {
-                        mb_internal_encoding($mbEncoding);
-                    }
-
                    return $value;
                }

@ -257,10 +287,6 @@ class Parser
            }
        }

-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
        if ($objectForMap && !is_object($data) && 'mapping' === $context) {
            $object = new \stdClass();

@ -289,7 +315,7 @@ class Parser
        $parser = new self($offset, $this->totalNumberOfLines, $skippedLineNumbers);
        $parser->refs = &$this->refs;

-        return $parser->parse($yaml, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+        return $parser->doParse($yaml, $exceptionOnInvalidType, $objectSupport, $objectForMap);
    }

    /**
--- a/web/vendor/symfony/yaml/phpunit.xml.dist
+++ b/web/vendor/symfony/yaml/phpunit.xml.dist
@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/web/vendor/twig/twig/.travis.yml
+++ b/web/vendor/twig/twig/.travis.yml
@ -8,36 +8,41 @@ cache:
        - $HOME/.composer/cache/files

 php:
-    - 5.2
    - 5.3
    - 5.4
    - 5.5
    - 5.6
    - 7.0
    - 7.1
-    - hhvm
+    - nightly

 env:
    - TWIG_EXT=no
    - TWIG_EXT=yes

 before_install:
-    - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
+    - phpenv config-rm xdebug.ini

 install:
-    # Composer is not available on PHP 5.2
-    - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer install; fi
+    - travis_retry composer install

 before_script:
    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi

+script: |
+    if [[ $TRAVIS_PHP_VERSION = 7.* || $TRAVIS_PHP_VERSION = nightly ]]; then
+        SYMFONY_PHPUNIT_VERSION=6.1 ./vendor/bin/simple-phpunit
+    else
+        ./vendor/bin/simple-phpunit
+    fi
+
 matrix:
    fast_finish: true
    exclude:
-        - php: hhvm
-          env: TWIG_EXT=yes
        - php: 7.0
          env: TWIG_EXT=yes
        - php: 7.1
          env: TWIG_EXT=yes
+        - php: nightly
+          env: TWIG_EXT=yes
--- a/web/vendor/twig/twig/CHANGELOG
+++ b/web/vendor/twig/twig/CHANGELOG
@ -1,3 +1,33 @@
+* 1.34.3 (2017-06-07)
+
+ * fixed namespaces introduction
+
+* 1.34.2 (2017-06-05)
+
+ * fixed namespaces introduction
+
+* 1.34.1 (2017-06-05)
+
+ * fixed namespaces introduction
+
+* 1.34.0 (2017-06-05)
+
+ * added support for PHPUnit 6 when testing extensions
+ * fixed PHP 7.2 compatibility
+ * fixed template name generation in Twig_Environment::createTemplate()
+ * removed final tag on Twig_TokenParser_Include
+ * added namespaced aliases for all (non-deprecated) classes and interfaces
+ * dropped HHVM support
+ * dropped PHP 5.2 support
+
+* 1.33.2 (2017-04-20)
+
+ * fixed edge case in the method cache for Twig attributes
+
+* 1.33.1 (2017-04-18)
+
+ * fixed the empty() test
+
 * 1.33.0 (2017-03-22)

 * fixed a race condition handling when writing cache files
--- a/web/vendor/twig/twig/composer.json
+++ b/web/vendor/twig/twig/composer.json
@ -27,7 +27,7 @@
        "forum": "https://groups.google.com/forum/#!forum/twig-users"
    },
    "require": {
-        "php": ">=5.2.7"
+        "php": ">=5.3.3"
    },
    "require-dev": {
        "symfony/phpunit-bridge": "~3.3@dev",
@ -37,11 +37,14 @@
    "autoload": {
        "psr-0" : {
            "Twig_" : "lib/"
+        },
+        "psr-4" : {
+            "Twig\\" : "src/"
        }
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.33-dev"
+            "dev-master": "1.34-dev"
        }
    }
 }
--- a/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
+++ b/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
@ -48,3 +48,7 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
     */
    abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
 }
+
+class_alias('Twig_BaseNodeVisitor', 'Twig\NodeVisitor\AbstractNodeVisitor', false);
+class_exists('Twig_Environment');
+class_exists('Twig_Node');
--- a/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ b/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@ -89,3 +89,5 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
        return (int) @filemtime($key);
    }
 }
+
+class_alias('Twig_Cache_Filesystem', 'Twig\Cache\FilesystemCache', false);
--- a/web/vendor/twig/twig/lib/Twig/Cache/Null.php
+++ b/web/vendor/twig/twig/lib/Twig/Cache/Null.php
@ -36,3 +36,5 @@ class Twig_Cache_Null implements Twig_CacheInterface
        return 0;
    }
 }
+
+class_alias('Twig_Cache_Null', 'Twig\Cache\NullCache', false);
--- a/web/vendor/twig/twig/lib/Twig/CacheInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/CacheInterface.php
@ -54,3 +54,5 @@ interface Twig_CacheInterface
     */
    public function getTimestamp($key);
 }
+
+class_alias('Twig_CacheInterface', 'Twig\Cache\CacheInterface', false);
--- a/web/vendor/twig/twig/lib/Twig/Compiler.php
+++ b/web/vendor/twig/twig/lib/Twig/Compiler.php
@ -279,3 +279,6 @@ class Twig_Compiler implements Twig_CompilerInterface
        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
    }
 }
+
+class_alias('Twig_Compiler', 'Twig\Compiler', false);
+class_exists('Twig_Node');
--- a/web/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
+++ b/web/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
@ -35,3 +35,5 @@ class Twig_ContainerRuntimeLoader implements Twig_RuntimeLoaderInterface
        }
    }
 }
+
+class_alias('Twig_ContainerRuntimeLoader', 'Twig\RuntimeLoader\ContainerRuntimeLoader', false);
--- a/Show more
+++ b/Show more