diff --git a/bootstrap/compiled.php b/bootstrap/compiled.php
index 59d9da868..a1ccc0718 100755
--- a/bootstrap/compiled.php
+++ b/bootstrap/compiled.php
@@ -232,7 +232,7 @@ protected function getConcrete($abstract)
     }
     protected function missingLeadingSlash($abstract)
     {
-        return is_string($abstract) && !starts_with($abstract, '\\');
+        return is_string($abstract) && strpos($abstract, '\\') !== 0;
     }
     public function build($concrete, $parameters = array())
     {
@@ -1118,7 +1118,7 @@ public static function createFromBase(SymfonyRequest $request)
         if ($request instanceof static) {
             return $request;
         }
-        return with($self = new static())->duplicate($request->query->all(), $request->request->all(), $request->attributes->all(), $request->cookies->all(), $request->files->all(), $request->server->all());
+        return with(new static())->duplicate($request->query->all(), $request->request->all(), $request->attributes->all(), $request->cookies->all(), $request->files->all(), $request->server->all());
     }
     public function session()
     {
@@ -3155,7 +3155,7 @@ public static function setFacadeApplication($app)
     }
     public static function __callStatic($method, $args)
     {
-        $instance = static::resolveFacadeInstance(static::getFacadeAccessor());
+        $instance = static::getFacadeRoot();
         switch (count($args)) {
             case 0:
                 return $instance->{$method}();
@@ -3382,6 +3382,12 @@ public function handle($level, $message, $file = 'unknown', $line = 0, $context
             if (!class_exists('Symfony\\Component\\Debug\\Exception\\ContextErrorException')) {
                 require __DIR__.'/../vendor/symfony/debug/Symfony/Component/Debug' . '/Exception/ContextErrorException.php';
             }
+            if (!class_exists('Symfony\\Component\\Debug\\Exception\\FlattenException')) {
+                require __DIR__.'/../vendor/symfony/debug/Symfony/Component/Debug' . '/Exception/FlattenException.php';
+            }
+            if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
+                unset($context['GLOBALS']);
+            }
             $exception = new ContextErrorException(sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line), 0, $level, $file, $line, $context);
             $exceptionHandler = set_exception_handler(function () {
                 
@@ -6702,10 +6708,10 @@ public function attributesToArray()
             if (!array_key_exists($key, $attributes)) {
                 continue;
             }
-            $attributes[$key] = $this->mutateAttribute($key, $attributes[$key]);
+            $attributes[$key] = $this->mutateAttributeForArray($key, $attributes[$key]);
         }
         foreach ($this->appends as $key) {
-            $attributes[$key] = $this->mutateAttribute($key, null);
+            $attributes[$key] = $this->mutateAttributeForArray($key, null);
         }
         return $attributes;
     }
@@ -6793,6 +6799,11 @@ protected function mutateAttribute($key, $value)
     {
         return $this->{'get' . studly_case($key) . 'Attribute'}($value);
     }
+    protected function mutateAttributeForArray($key, $value)
+    {
+        $value = $this->mutateAttribute($key, $value);
+        return $value instanceof ArrayableInterface ? $value->toArray() : $value;
+    }
     public function setAttribute($key, $value)
     {
         if ($this->hasSetMutator($key)) {
@@ -7924,7 +7935,7 @@ protected function addPadding($value)
     protected function stripPadding($value)
     {
         $pad = ord($value[($len = strlen($value)) - 1]);
-        return $this->paddingIsValid($pad, $value) ? substr($value, 0, strlen($value) - $pad) : $value;
+        return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
     }
     protected function paddingIsValid($pad, $value)
     {
@@ -8137,6 +8148,10 @@ public function popHandler()
         }
         return array_shift($this->handlers);
     }
+    public function getHandlers()
+    {
+        return $this->handlers;
+    }
     public function pushProcessor($callback)
     {
         if (!is_callable($callback)) {
@@ -8151,6 +8166,10 @@ public function popProcessor()
         }
         return array_shift($this->processors);
     }
+    public function getProcessors()
+    {
+        return $this->processors;
+    }
     public function addRecord($level, $message, array $context = array())
     {
         if (!$this->handlers) {
@@ -8476,7 +8495,7 @@ class RotatingFileHandler extends StreamHandler
     protected $nextRotation;
     protected $filenameFormat;
     protected $dateFormat;
-    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = 420)
+    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null)
     {
         $this->filename = $filename;
         $this->maxFiles = (int) $maxFiles;
diff --git a/composer.lock b/composer.lock
index fa356ed7c..caf78633f 100755
--- a/composer.lock
+++ b/composer.lock
@@ -230,12 +230,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "a8297d82813827b6ca72866d334226d6697ea828"
+                "reference": "c1d343a07169fc9f2b88320275100c48a6169580"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a8297d82813827b6ca72866d334226d6697ea828",
-                "reference": "a8297d82813827b6ca72866d334226d6697ea828",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c1d343a07169fc9f2b88320275100c48a6169580",
+                "reference": "c1d343a07169fc9f2b88320275100c48a6169580",
                 "shasum": ""
             },
             "require": {
@@ -262,7 +262,7 @@
                 "symfony/http-kernel": "2.4.*",
                 "symfony/process": "2.4.*",
                 "symfony/routing": "2.4.*",
-                "symfony/security": "2.4.*",
+                "symfony/security-core": "2.4.*",
                 "symfony/translation": "2.4.*"
             },
             "replace": {
@@ -330,7 +330,7 @@
                     "name": "Taylor Otwell",
                     "email": "taylorotwell@gmail.com",
                     "homepage": "https://github.com/taylorotwell",
-                    "role": "Developer"
+                    "role": "Creator of Laravel"
                 }
             ],
             "description": "The Laravel Framework.",
@@ -338,7 +338,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2014-04-19 18:02:02"
+            "time": "2014-05-11 17:20:27"
         },
         {
             "name": "monolog/monolog",
@@ -346,12 +346,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1afc39690e7414412face1f8cbf67b73db34485c"
+                "reference": "467e30a9c9fa22395608cc515cd45a60ecc84c4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1afc39690e7414412face1f8cbf67b73db34485c",
-                "reference": "1afc39690e7414412face1f8cbf67b73db34485c",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/467e30a9c9fa22395608cc515cd45a60ecc84c4e",
+                "reference": "467e30a9c9fa22395608cc515cd45a60ecc84c4e",
                 "shasum": ""
             },
             "require": {
@@ -406,20 +406,20 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-04-20 16:41:26"
+            "time": "2014-05-01 15:55:56"
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "21c4cb4301969c7d85aee8a62eefdfa881413af0"
+                "reference": "b94de7192b01d0e80794eae984dcc773220ab0dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/21c4cb4301969c7d85aee8a62eefdfa881413af0",
-                "reference": "21c4cb4301969c7d85aee8a62eefdfa881413af0",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b94de7192b01d0e80794eae984dcc773220ab0dc",
+                "reference": "b94de7192b01d0e80794eae984dcc773220ab0dc",
                 "shasum": ""
             },
             "require": {
@@ -452,7 +452,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2014-01-07 05:10:44"
+            "time": "2014-05-13 02:29:30"
         },
         {
             "name": "nikic/php-parser",
@@ -501,16 +501,16 @@
         },
         {
             "name": "patchwork/utf8",
-            "version": "v1.1.21",
+            "version": "v1.1.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
-                "reference": "f45ba8bc7962b7356847724989a6949b68d975a2"
+                "reference": "156e66249f48e439a31df2347290bb9ab1d3d242"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/f45ba8bc7962b7356847724989a6949b68d975a2",
-                "reference": "f45ba8bc7962b7356847724989a6949b68d975a2",
+                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/156e66249f48e439a31df2347290bb9ab1d3d242",
+                "reference": "156e66249f48e439a31df2347290bb9ab1d3d242",
                 "shasum": ""
             },
             "require": {
@@ -548,7 +548,7 @@
                 "utf-8",
                 "utf8"
             ],
-            "time": "2014-03-26 10:52:02"
+            "time": "2014-05-06 15:47:10"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -556,12 +556,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "b90deb5e835be55dfe109f9806395b29499e726a"
+                "reference": "3a309d36edd85451cf51b63adcbc6899c5211ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b90deb5e835be55dfe109f9806395b29499e726a",
-                "reference": "b90deb5e835be55dfe109f9806395b29499e726a",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/3a309d36edd85451cf51b63adcbc6899c5211ae2",
+                "reference": "3a309d36edd85451cf51b63adcbc6899c5211ae2",
                 "shasum": ""
             },
             "require": {
@@ -645,7 +645,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2014-04-19 13:44:29"
+            "time": "2014-05-05 22:49:44"
         },
         {
             "name": "predis/predis",
@@ -743,12 +743,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/rmccue/Requests.git",
-                "reference": "dab8807848d87fbc0f350934b804044a9fa12954"
+                "reference": "c86bc71809eaaff1584ad2c8a0fbedf367d3a70d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rmccue/Requests/zipball/dab8807848d87fbc0f350934b804044a9fa12954",
-                "reference": "dab8807848d87fbc0f350934b804044a9fa12954",
+                "url": "https://api.github.com/repos/rmccue/Requests/zipball/c86bc71809eaaff1584ad2c8a0fbedf367d3a70d",
+                "reference": "c86bc71809eaaff1584ad2c8a0fbedf367d3a70d",
                 "shasum": ""
             },
             "require": {
@@ -785,7 +785,7 @@
                 "iri",
                 "sockets"
             ],
-            "time": "2014-04-20 08:04:40"
+            "time": "2014-04-23 10:15:27"
         },
         {
             "name": "sayakb/akismet",
@@ -943,24 +943,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "d5d580ca7ced89955ce7200f41fb0f97b8f74c60"
+                "reference": "46d55baab96f943061de6712b38011db354eed78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d5d580ca7ced89955ce7200f41fb0f97b8f74c60",
-                "reference": "d5d580ca7ced89955ce7200f41fb0f97b8f74c60",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/46d55baab96f943061de6712b38011db354eed78",
+                "reference": "46d55baab96f943061de6712b38011db354eed78",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9@dev"
+                "mockery/mockery": "~0.9.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-master": "5.2-dev"
                 }
             },
             "autoload": {
@@ -989,7 +989,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2014-04-13 13:06:08"
+            "time": "2014-05-08 08:35:11"
         },
         {
             "name": "symfony/browser-kit",
@@ -998,12 +998,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/BrowserKit.git",
-                "reference": "90a4d3536598f8a372df8d0730daf0874fec6e5b"
+                "reference": "5c80003d5772de6120b5429f4b2f6e22957d4a07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/90a4d3536598f8a372df8d0730daf0874fec6e5b",
-                "reference": "90a4d3536598f8a372df8d0730daf0874fec6e5b",
+                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/5c80003d5772de6120b5429f4b2f6e22957d4a07",
+                "reference": "5c80003d5772de6120b5429f4b2f6e22957d4a07",
                 "shasum": ""
             },
             "require": {
@@ -1046,7 +1046,7 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:37:09"
+            "time": "2014-05-12 09:27:48"
         },
         {
             "name": "symfony/console",
@@ -1055,12 +1055,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "ce0fad2e725d198bd94b33affb7fa1fef085b15f"
+                "reference": "24f723436e62598c9dddee2a8573d6992504dc5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/ce0fad2e725d198bd94b33affb7fa1fef085b15f",
-                "reference": "ce0fad2e725d198bd94b33affb7fa1fef085b15f",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/24f723436e62598c9dddee2a8573d6992504dc5d",
+                "reference": "24f723436e62598c9dddee2a8573d6992504dc5d",
                 "shasum": ""
             },
             "require": {
@@ -1101,7 +1101,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:42"
+            "time": "2014-05-14 21:48:29"
         },
         {
             "name": "symfony/css-selector",
@@ -1110,12 +1110,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3"
+                "reference": "268d0a51166edaf84dfcf043c57f273685cb7c93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/479a5b409723f596ffc3b5178034e4d76ce615b3",
-                "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3",
+                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/268d0a51166edaf84dfcf043c57f273685cb7c93",
+                "reference": "268d0a51166edaf84dfcf043c57f273685cb7c93",
                 "shasum": ""
             },
             "require": {
@@ -1154,7 +1154,7 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:37:09"
+            "time": "2014-05-12 09:27:48"
         },
         {
             "name": "symfony/debug",
@@ -1163,12 +1163,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02"
+                "reference": "6e721ae2cd7bde0f8dfa9c3186808a6c4140469c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
-                "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/6e721ae2cd7bde0f8dfa9c3186808a6c4140469c",
+                "reference": "6e721ae2cd7bde0f8dfa9c3186808a6c4140469c",
                 "shasum": ""
             },
             "require": {
@@ -1211,7 +1211,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:42"
+            "time": "2014-04-30 06:22:28"
         },
         {
             "name": "symfony/dom-crawler",
@@ -1220,12 +1220,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DomCrawler.git",
-                "reference": "e94b29c7cac964e58c406408d238ceeaa3604e78"
+                "reference": "778356eb2e846327f25ec326d2ec6ff32f1e363b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e94b29c7cac964e58c406408d238ceeaa3604e78",
-                "reference": "e94b29c7cac964e58c406408d238ceeaa3604e78",
+                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/778356eb2e846327f25ec326d2ec6ff32f1e363b",
+                "reference": "778356eb2e846327f25ec326d2ec6ff32f1e363b",
                 "shasum": ""
             },
             "require": {
@@ -1266,7 +1266,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:37:09"
+            "time": "2014-05-17 20:48:34"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -1275,12 +1275,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "133627e57441b50128807702bea0d395129809ad"
+                "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/133627e57441b50128807702bea0d395129809ad",
-                "reference": "133627e57441b50128807702bea0d395129809ad",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
+                "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
                 "shasum": ""
             },
             "require": {
@@ -1288,6 +1288,7 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
+                "symfony/config": "~2.0",
                 "symfony/dependency-injection": "~2.0",
                 "symfony/stopwatch": "~2.2"
             },
@@ -1324,7 +1325,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:36:21"
+            "time": "2014-04-29 10:13:57"
         },
         {
             "name": "symfony/filesystem",
@@ -1382,12 +1383,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Finder.git",
-                "reference": "c47b1b0983599d30e4d4f302189c500d18cd9d12"
+                "reference": "aadc42496dd37b61e1d57a0e86bf77f6005f576c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/c47b1b0983599d30e4d4f302189c500d18cd9d12",
-                "reference": "c47b1b0983599d30e4d4f302189c500d18cd9d12",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/aadc42496dd37b61e1d57a0e86bf77f6005f576c",
+                "reference": "aadc42496dd37b61e1d57a0e86bf77f6005f576c",
                 "shasum": ""
             },
             "require": {
@@ -1422,7 +1423,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 21:02:05"
+            "time": "2014-05-12 09:27:48"
         },
         {
             "name": "symfony/http-foundation",
@@ -1431,12 +1432,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b"
+                "reference": "473f988bf3684896608056a5c8c05ce67348a1e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/22c4dee84271ad0cd08d19f26d89f2878e11159b",
-                "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/473f988bf3684896608056a5c8c05ce67348a1e9",
+                "reference": "473f988bf3684896608056a5c8c05ce67348a1e9",
                 "shasum": ""
             },
             "require": {
@@ -1477,7 +1478,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 21:02:05"
+            "time": "2014-05-17 20:48:34"
         },
         {
             "name": "symfony/http-kernel",
@@ -1486,12 +1487,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "ab2b23f9b5a868ba35196a73b7c5ba1e312eee88"
+                "reference": "d5746a530c872d926b01b909ee05a505642b6220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/ab2b23f9b5a868ba35196a73b7c5ba1e312eee88",
-                "reference": "ab2b23f9b5a868ba35196a73b7c5ba1e312eee88",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/d5746a530c872d926b01b909ee05a505642b6220",
+                "reference": "d5746a530c872d926b01b909ee05a505642b6220",
                 "shasum": ""
             },
             "require": {
@@ -1507,6 +1508,7 @@
                 "symfony/config": "~2.0",
                 "symfony/console": "~2.2",
                 "symfony/dependency-injection": "~2.0",
+                "symfony/filesystem": "~2.4",
                 "symfony/finder": "~2.0",
                 "symfony/process": "~2.0",
                 "symfony/routing": "~2.2",
@@ -1519,6 +1521,7 @@
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
+                "symfony/filesystem": "",
                 "symfony/finder": ""
             },
             "type": "library",
@@ -1550,7 +1553,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:41:38"
+            "time": "2014-05-17 20:48:34"
         },
         {
             "name": "symfony/process",
@@ -1559,12 +1562,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Process.git",
-                "reference": "767454b343816f124e8b80c8c5d0d66094864fd1"
+                "reference": "8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/767454b343816f124e8b80c8c5d0d66094864fd1",
-                "reference": "767454b343816f124e8b80c8c5d0d66094864fd1",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7",
+                "reference": "8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7",
                 "shasum": ""
             },
             "require": {
@@ -1599,7 +1602,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:37:09"
+            "time": "2014-04-27 13:34:57"
         },
         {
             "name": "symfony/routing",
@@ -1608,12 +1611,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing.git",
-                "reference": "916bad70c99e6e66487ebaa3efb335808b13830d"
+                "reference": "74229f66e16bce6d2415ca44d4756f8e7ea880f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/916bad70c99e6e66487ebaa3efb335808b13830d",
-                "reference": "916bad70c99e6e66487ebaa3efb335808b13830d",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/74229f66e16bce6d2415ca44d4756f8e7ea880f8",
+                "reference": "74229f66e16bce6d2415ca44d4756f8e7ea880f8",
                 "shasum": ""
             },
             "require": {
@@ -1667,7 +1670,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2014-04-18 20:37:09"
+            "time": "2014-04-23 14:04:21"
         },
         {
             "name": "symfony/security",
@@ -1676,12 +1679,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Security.git",
-                "reference": "c70001ec82326f9581814ac002af6b904d24c4cd"
+                "reference": "2fea8ebda136c2a1457afa8a1428ac18444fd156"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Security/zipball/c70001ec82326f9581814ac002af6b904d24c4cd",
-                "reference": "c70001ec82326f9581814ac002af6b904d24c4cd",
+                "url": "https://api.github.com/repos/symfony/Security/zipball/2fea8ebda136c2a1457afa8a1428ac18444fd156",
+                "reference": "2fea8ebda136c2a1457afa8a1428ac18444fd156",
                 "shasum": ""
             },
             "require": {
@@ -1743,7 +1746,7 @@
             ],
             "description": "Symfony Security Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:45:55"
+            "time": "2014-05-12 09:27:48"
         },
         {
             "name": "symfony/translation",
@@ -1752,12 +1755,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation.git",
-                "reference": "d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5"
+                "reference": "b19285ff60fe8d145d46f4c7e2175f9c135c1f6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Translation/zipball/d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5",
-                "reference": "d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/b19285ff60fe8d145d46f4c7e2175f9c135c1f6c",
+                "reference": "b19285ff60fe8d145d46f4c7e2175f9c135c1f6c",
                 "shasum": ""
             },
             "require": {
@@ -1800,7 +1803,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 21:02:05"
+            "time": "2014-05-12 09:27:48"
         }
     ],
     "packages-dev": [
diff --git a/public/nginx.config b/public/nginx.config
old mode 100644
new mode 100755
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 5dee0d6ad..82f816233 100755
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit8fad3f80dbffa78b3d490c0239bba4ff::getLoader();
+return ComposerAutoloaderInit837a5238a9b2b1fc9aef0d824ac25f6c::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 4ac1abef1..8b34f7d7f 100755
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit8fad3f80dbffa78b3d490c0239bba4ff
+class ComposerAutoloaderInit837a5238a9b2b1fc9aef0d824ac25f6c
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit8fad3f80dbffa78b3d490c0239bba4ff', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit837a5238a9b2b1fc9aef0d824ac25f6c', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit8fad3f80dbffa78b3d490c0239bba4ff', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit837a5238a9b2b1fc9aef0d824ac25f6c', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -49,14 +49,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire8fad3f80dbffa78b3d490c0239bba4ff($file);
+            composerRequire837a5238a9b2b1fc9aef0d824ac25f6c($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire8fad3f80dbffa78b3d490c0239bba4ff($file)
+function composerRequire837a5238a9b2b1fc9aef0d824ac25f6c($file)
 {
     require $file;
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 1ae1db265..e2cf229fc 100755
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -247,12 +247,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/EventDispatcher.git",
-            "reference": "133627e57441b50128807702bea0d395129809ad"
+            "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/133627e57441b50128807702bea0d395129809ad",
-            "reference": "133627e57441b50128807702bea0d395129809ad",
+            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
+            "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
             "shasum": ""
         },
         "require": {
@@ -260,6 +260,7 @@
         },
         "require-dev": {
             "psr/log": "~1.0",
+            "symfony/config": "~2.0",
             "symfony/dependency-injection": "~2.0",
             "symfony/stopwatch": "~2.2"
         },
@@ -267,7 +268,7 @@
             "symfony/dependency-injection": "",
             "symfony/http-kernel": ""
         },
-        "time": "2014-04-16 10:36:21",
+        "time": "2014-04-29 10:13:57",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -358,12 +359,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "b90deb5e835be55dfe109f9806395b29499e726a"
+            "reference": "3a309d36edd85451cf51b63adcbc6899c5211ae2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b90deb5e835be55dfe109f9806395b29499e726a",
-            "reference": "b90deb5e835be55dfe109f9806395b29499e726a",
+            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/3a309d36edd85451cf51b63adcbc6899c5211ae2",
+            "reference": "3a309d36edd85451cf51b63adcbc6899c5211ae2",
             "shasum": ""
         },
         "require": {
@@ -379,7 +380,7 @@
             "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
             "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3."
         },
-        "time": "2014-04-19 13:44:29",
+        "time": "2014-05-05 22:49:44",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -503,54 +504,6 @@
             "zf2"
         ]
     },
-    {
-        "name": "nesbot/carbon",
-        "version": "1.8.0",
-        "version_normalized": "1.8.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/briannesbitt/Carbon.git",
-            "reference": "21c4cb4301969c7d85aee8a62eefdfa881413af0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/21c4cb4301969c7d85aee8a62eefdfa881413af0",
-            "reference": "21c4cb4301969c7d85aee8a62eefdfa881413af0",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "3.7.*"
-        },
-        "time": "2014-01-07 05:10:44",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Carbon": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Brian Nesbitt",
-                "email": "brian@nesbot.com",
-                "homepage": "http://nesbot.com"
-            }
-        ],
-        "description": "A simple API extension for DateTime.",
-        "homepage": "https://github.com/briannesbitt/Carbon",
-        "keywords": [
-            "date",
-            "datetime",
-            "time"
-        ]
-    },
     {
         "name": "symfony/filesystem",
         "version": "dev-master",
@@ -687,59 +640,6 @@
             "preload"
         ]
     },
-    {
-        "name": "patchwork/utf8",
-        "version": "v1.1.21",
-        "version_normalized": "1.1.21.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
-            "reference": "f45ba8bc7962b7356847724989a6949b68d975a2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/f45ba8bc7962b7356847724989a6949b68d975a2",
-            "reference": "f45ba8bc7962b7356847724989a6949b68d975a2",
-            "shasum": ""
-        },
-        "require": {
-            "lib-pcre": ">=7.3",
-            "php": ">=5.3.0"
-        },
-        "suggest": {
-            "ext-iconv": "Use iconv for best performance",
-            "ext-intl": "Use Intl for best performance",
-            "ext-mbstring": "Use Mbstring for best performance"
-        },
-        "time": "2014-03-26 10:52:02",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Patchwork": "class/",
-                "Normalizer": "class/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "(Apache-2.0 or GPL-2.0)"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com",
-                "role": "Developer"
-            }
-        ],
-        "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP",
-        "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8",
-        "keywords": [
-            "i18n",
-            "unicode",
-            "utf-8",
-            "utf8"
-        ]
-    },
     {
         "name": "predis/predis",
         "version": "0.8.x-dev",
@@ -796,12 +696,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "1afc39690e7414412face1f8cbf67b73db34485c"
+            "reference": "467e30a9c9fa22395608cc515cd45a60ecc84c4e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1afc39690e7414412face1f8cbf67b73db34485c",
-            "reference": "1afc39690e7414412face1f8cbf67b73db34485c",
+            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/467e30a9c9fa22395608cc515cd45a60ecc84c4e",
+            "reference": "467e30a9c9fa22395608cc515cd45a60ecc84c4e",
             "shasum": ""
         },
         "require": {
@@ -826,7 +726,7 @@
             "rollbar/rollbar": "Allow sending log messages to Rollbar",
             "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
         },
-        "time": "2014-04-20 16:41:26",
+        "time": "2014-05-01 15:55:56",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -859,6 +759,154 @@
             "psr-3"
         ]
     },
+    {
+        "name": "nikic/php-parser",
+        "version": "0.9.x-dev",
+        "version_normalized": "0.9.9999999.9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nikic/PHP-Parser.git",
+            "reference": "5960ecfc105011b8d1bfedf7647b4b8989dbcb4c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5960ecfc105011b8d1bfedf7647b4b8989dbcb4c",
+            "reference": "5960ecfc105011b8d1bfedf7647b4b8989dbcb4c",
+            "shasum": ""
+        },
+        "require": {
+            "ext-tokenizer": "*",
+            "php": ">=5.2"
+        },
+        "time": "2014-04-19 20:26:05",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "0.9-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "PHPParser": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Nikita Popov"
+            }
+        ],
+        "description": "A PHP parser written in PHP",
+        "keywords": [
+            "parser",
+            "php"
+        ]
+    },
+    {
+        "name": "nesbot/carbon",
+        "version": "1.9.0",
+        "version_normalized": "1.9.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/briannesbitt/Carbon.git",
+            "reference": "b94de7192b01d0e80794eae984dcc773220ab0dc"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b94de7192b01d0e80794eae984dcc773220ab0dc",
+            "reference": "b94de7192b01d0e80794eae984dcc773220ab0dc",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "3.7.*"
+        },
+        "time": "2014-05-13 02:29:30",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Carbon": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Brian Nesbitt",
+                "email": "brian@nesbot.com",
+                "homepage": "http://nesbot.com"
+            }
+        ],
+        "description": "A simple API extension for DateTime.",
+        "homepage": "https://github.com/briannesbitt/Carbon",
+        "keywords": [
+            "date",
+            "datetime",
+            "time"
+        ]
+    },
+    {
+        "name": "patchwork/utf8",
+        "version": "v1.1.22",
+        "version_normalized": "1.1.22.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
+            "reference": "156e66249f48e439a31df2347290bb9ab1d3d242"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/156e66249f48e439a31df2347290bb9ab1d3d242",
+            "reference": "156e66249f48e439a31df2347290bb9ab1d3d242",
+            "shasum": ""
+        },
+        "require": {
+            "lib-pcre": ">=7.3",
+            "php": ">=5.3.0"
+        },
+        "suggest": {
+            "ext-iconv": "Use iconv for best performance",
+            "ext-intl": "Use Intl for best performance",
+            "ext-mbstring": "Use Mbstring for best performance"
+        },
+        "time": "2014-05-06 15:47:10",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Patchwork": "class/",
+                "Normalizer": "class/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "(Apache-2.0 or GPL-2.0)"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com",
+                "role": "Developer"
+            }
+        ],
+        "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP",
+        "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8",
+        "keywords": [
+            "i18n",
+            "unicode",
+            "utf-8",
+            "utf8"
+        ]
+    },
     {
         "name": "swiftmailer/swiftmailer",
         "version": "dev-master",
@@ -866,25 +914,25 @@
         "source": {
             "type": "git",
             "url": "https://github.com/swiftmailer/swiftmailer.git",
-            "reference": "d5d580ca7ced89955ce7200f41fb0f97b8f74c60"
+            "reference": "46d55baab96f943061de6712b38011db354eed78"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d5d580ca7ced89955ce7200f41fb0f97b8f74c60",
-            "reference": "d5d580ca7ced89955ce7200f41fb0f97b8f74c60",
+            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/46d55baab96f943061de6712b38011db354eed78",
+            "reference": "46d55baab96f943061de6712b38011db354eed78",
             "shasum": ""
         },
         "require": {
             "php": ">=5.2.4"
         },
         "require-dev": {
-            "mockery/mockery": "~0.9@dev"
+            "mockery/mockery": "~0.9.1"
         },
-        "time": "2014-04-13 13:06:08",
+        "time": "2014-05-08 08:35:11",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "5.1-dev"
+                "dev-master": "5.2-dev"
             }
         },
         "installation-source": "dist",
@@ -923,12 +971,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Security.git",
-            "reference": "c70001ec82326f9581814ac002af6b904d24c4cd"
+            "reference": "2fea8ebda136c2a1457afa8a1428ac18444fd156"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Security/zipball/c70001ec82326f9581814ac002af6b904d24c4cd",
-            "reference": "c70001ec82326f9581814ac002af6b904d24c4cd",
+            "url": "https://api.github.com/repos/symfony/Security/zipball/2fea8ebda136c2a1457afa8a1428ac18444fd156",
+            "reference": "2fea8ebda136c2a1457afa8a1428ac18444fd156",
             "shasum": ""
         },
         "require": {
@@ -961,7 +1009,7 @@
             "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs",
             "symfony/validator": "For using the user password constraint"
         },
-        "time": "2014-04-18 20:45:55",
+        "time": "2014-05-12 09:27:48",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -993,53 +1041,6 @@
         "description": "Symfony Security Component",
         "homepage": "http://symfony.com"
     },
-    {
-        "name": "nikic/php-parser",
-        "version": "0.9.x-dev",
-        "version_normalized": "0.9.9999999.9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nikic/PHP-Parser.git",
-            "reference": "5960ecfc105011b8d1bfedf7647b4b8989dbcb4c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5960ecfc105011b8d1bfedf7647b4b8989dbcb4c",
-            "reference": "5960ecfc105011b8d1bfedf7647b4b8989dbcb4c",
-            "shasum": ""
-        },
-        "require": {
-            "ext-tokenizer": "*",
-            "php": ">=5.2"
-        },
-        "time": "2014-04-19 20:26:05",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.9-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "PHPParser": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Nikita Popov"
-            }
-        ],
-        "description": "A PHP parser written in PHP",
-        "keywords": [
-            "parser",
-            "php"
-        ]
-    },
     {
         "name": "symfony/finder",
         "version": "2.4.x-dev",
@@ -1048,18 +1049,18 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Finder.git",
-            "reference": "c47b1b0983599d30e4d4f302189c500d18cd9d12"
+            "reference": "aadc42496dd37b61e1d57a0e86bf77f6005f576c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Finder/zipball/c47b1b0983599d30e4d4f302189c500d18cd9d12",
-            "reference": "c47b1b0983599d30e4d4f302189c500d18cd9d12",
+            "url": "https://api.github.com/repos/symfony/Finder/zipball/aadc42496dd37b61e1d57a0e86bf77f6005f576c",
+            "reference": "aadc42496dd37b61e1d57a0e86bf77f6005f576c",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2014-04-18 21:02:05",
+        "time": "2014-05-12 09:27:48",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1098,12 +1099,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/rmccue/Requests.git",
-            "reference": "dab8807848d87fbc0f350934b804044a9fa12954"
+            "reference": "c86bc71809eaaff1584ad2c8a0fbedf367d3a70d"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/rmccue/Requests/zipball/dab8807848d87fbc0f350934b804044a9fa12954",
-            "reference": "dab8807848d87fbc0f350934b804044a9fa12954",
+            "url": "https://api.github.com/repos/rmccue/Requests/zipball/c86bc71809eaaff1584ad2c8a0fbedf367d3a70d",
+            "reference": "c86bc71809eaaff1584ad2c8a0fbedf367d3a70d",
             "shasum": ""
         },
         "require": {
@@ -1113,7 +1114,7 @@
             "requests/test-server": "dev-master",
             "satooshi/php-coveralls": "dev-master"
         },
-        "time": "2014-04-20 08:04:40",
+        "time": "2014-04-23 10:15:27",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -1151,18 +1152,18 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Process.git",
-            "reference": "767454b343816f124e8b80c8c5d0d66094864fd1"
+            "reference": "8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Process/zipball/767454b343816f124e8b80c8c5d0d66094864fd1",
-            "reference": "767454b343816f124e8b80c8c5d0d66094864fd1",
+            "url": "https://api.github.com/repos/symfony/Process/zipball/8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7",
+            "reference": "8721f1476d5d38a43c7d6ccb6435b351cf8f3bb7",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2014-04-18 20:37:09",
+        "time": "2014-04-27 13:34:57",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1202,12 +1203,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/DomCrawler.git",
-            "reference": "e94b29c7cac964e58c406408d238ceeaa3604e78"
+            "reference": "778356eb2e846327f25ec326d2ec6ff32f1e363b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e94b29c7cac964e58c406408d238ceeaa3604e78",
-            "reference": "e94b29c7cac964e58c406408d238ceeaa3604e78",
+            "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/778356eb2e846327f25ec326d2ec6ff32f1e363b",
+            "reference": "778356eb2e846327f25ec326d2ec6ff32f1e363b",
             "shasum": ""
         },
         "require": {
@@ -1219,7 +1220,7 @@
         "suggest": {
             "symfony/css-selector": ""
         },
-        "time": "2014-04-18 20:37:09",
+        "time": "2014-05-17 20:48:34",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1259,18 +1260,18 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/CssSelector.git",
-            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3"
+            "reference": "268d0a51166edaf84dfcf043c57f273685cb7c93"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/CssSelector/zipball/479a5b409723f596ffc3b5178034e4d76ce615b3",
-            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3",
+            "url": "https://api.github.com/repos/symfony/CssSelector/zipball/268d0a51166edaf84dfcf043c57f273685cb7c93",
+            "reference": "268d0a51166edaf84dfcf043c57f273685cb7c93",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2014-04-18 20:37:09",
+        "time": "2014-05-12 09:27:48",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1314,12 +1315,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Routing.git",
-            "reference": "916bad70c99e6e66487ebaa3efb335808b13830d"
+            "reference": "74229f66e16bce6d2415ca44d4756f8e7ea880f8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Routing/zipball/916bad70c99e6e66487ebaa3efb335808b13830d",
-            "reference": "916bad70c99e6e66487ebaa3efb335808b13830d",
+            "url": "https://api.github.com/repos/symfony/Routing/zipball/74229f66e16bce6d2415ca44d4756f8e7ea880f8",
+            "reference": "74229f66e16bce6d2415ca44d4756f8e7ea880f8",
             "shasum": ""
         },
         "require": {
@@ -1338,7 +1339,7 @@
             "symfony/expression-language": "For using expression matching",
             "symfony/yaml": "For using the YAML loader"
         },
-        "time": "2014-04-18 20:37:09",
+        "time": "2014-04-23 14:04:21",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1384,12 +1385,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Translation.git",
-            "reference": "d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5"
+            "reference": "b19285ff60fe8d145d46f4c7e2175f9c135c1f6c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Translation/zipball/d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5",
-            "reference": "d2c73ffa4a5ba1fa0c5d93f43b68331dffe898c5",
+            "url": "https://api.github.com/repos/symfony/Translation/zipball/b19285ff60fe8d145d46f4c7e2175f9c135c1f6c",
+            "reference": "b19285ff60fe8d145d46f4c7e2175f9c135c1f6c",
             "shasum": ""
         },
         "require": {
@@ -1403,7 +1404,7 @@
             "symfony/config": "",
             "symfony/yaml": ""
         },
-        "time": "2014-04-18 21:02:05",
+        "time": "2014-05-12 09:27:48",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1443,12 +1444,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Debug.git",
-            "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02"
+            "reference": "6e721ae2cd7bde0f8dfa9c3186808a6c4140469c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Debug/zipball/6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
-            "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
+            "url": "https://api.github.com/repos/symfony/Debug/zipball/6e721ae2cd7bde0f8dfa9c3186808a6c4140469c",
+            "reference": "6e721ae2cd7bde0f8dfa9c3186808a6c4140469c",
             "shasum": ""
         },
         "require": {
@@ -1462,7 +1463,7 @@
             "symfony/http-foundation": "",
             "symfony/http-kernel": ""
         },
-        "time": "2014-04-16 10:34:42",
+        "time": "2014-04-30 06:22:28",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1502,12 +1503,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Console.git",
-            "reference": "ce0fad2e725d198bd94b33affb7fa1fef085b15f"
+            "reference": "24f723436e62598c9dddee2a8573d6992504dc5d"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Console/zipball/ce0fad2e725d198bd94b33affb7fa1fef085b15f",
-            "reference": "ce0fad2e725d198bd94b33affb7fa1fef085b15f",
+            "url": "https://api.github.com/repos/symfony/Console/zipball/24f723436e62598c9dddee2a8573d6992504dc5d",
+            "reference": "24f723436e62598c9dddee2a8573d6992504dc5d",
             "shasum": ""
         },
         "require": {
@@ -1519,7 +1520,7 @@
         "suggest": {
             "symfony/event-dispatcher": ""
         },
-        "time": "2014-04-16 10:34:42",
+        "time": "2014-05-14 21:48:29",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1559,12 +1560,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/BrowserKit.git",
-            "reference": "90a4d3536598f8a372df8d0730daf0874fec6e5b"
+            "reference": "5c80003d5772de6120b5429f4b2f6e22957d4a07"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/90a4d3536598f8a372df8d0730daf0874fec6e5b",
-            "reference": "90a4d3536598f8a372df8d0730daf0874fec6e5b",
+            "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/5c80003d5772de6120b5429f4b2f6e22957d4a07",
+            "reference": "5c80003d5772de6120b5429f4b2f6e22957d4a07",
             "shasum": ""
         },
         "require": {
@@ -1578,7 +1579,7 @@
         "suggest": {
             "symfony/process": ""
         },
-        "time": "2014-04-18 20:37:09",
+        "time": "2014-05-12 09:27:48",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1618,12 +1619,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/HttpFoundation.git",
-            "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b"
+            "reference": "473f988bf3684896608056a5c8c05ce67348a1e9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/22c4dee84271ad0cd08d19f26d89f2878e11159b",
-            "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b",
+            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/473f988bf3684896608056a5c8c05ce67348a1e9",
+            "reference": "473f988bf3684896608056a5c8c05ce67348a1e9",
             "shasum": ""
         },
         "require": {
@@ -1632,7 +1633,7 @@
         "require-dev": {
             "symfony/expression-language": "~2.4"
         },
-        "time": "2014-04-18 21:02:05",
+        "time": "2014-05-17 20:48:34",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1675,12 +1676,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/HttpKernel.git",
-            "reference": "ab2b23f9b5a868ba35196a73b7c5ba1e312eee88"
+            "reference": "d5746a530c872d926b01b909ee05a505642b6220"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/ab2b23f9b5a868ba35196a73b7c5ba1e312eee88",
-            "reference": "ab2b23f9b5a868ba35196a73b7c5ba1e312eee88",
+            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/d5746a530c872d926b01b909ee05a505642b6220",
+            "reference": "d5746a530c872d926b01b909ee05a505642b6220",
             "shasum": ""
         },
         "require": {
@@ -1696,6 +1697,7 @@
             "symfony/config": "~2.0",
             "symfony/console": "~2.2",
             "symfony/dependency-injection": "~2.0",
+            "symfony/filesystem": "~2.4",
             "symfony/finder": "~2.0",
             "symfony/process": "~2.0",
             "symfony/routing": "~2.2",
@@ -1708,9 +1710,10 @@
             "symfony/config": "",
             "symfony/console": "",
             "symfony/dependency-injection": "",
+            "symfony/filesystem": "",
             "symfony/finder": ""
         },
-        "time": "2014-04-18 20:41:38",
+        "time": "2014-05-17 20:48:34",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1749,12 +1752,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/laravel/framework.git",
-            "reference": "a8297d82813827b6ca72866d334226d6697ea828"
+            "reference": "c1d343a07169fc9f2b88320275100c48a6169580"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/laravel/framework/zipball/a8297d82813827b6ca72866d334226d6697ea828",
-            "reference": "a8297d82813827b6ca72866d334226d6697ea828",
+            "url": "https://api.github.com/repos/laravel/framework/zipball/c1d343a07169fc9f2b88320275100c48a6169580",
+            "reference": "c1d343a07169fc9f2b88320275100c48a6169580",
             "shasum": ""
         },
         "require": {
@@ -1781,7 +1784,7 @@
             "symfony/http-kernel": "2.4.*",
             "symfony/process": "2.4.*",
             "symfony/routing": "2.4.*",
-            "symfony/security": "2.4.*",
+            "symfony/security-core": "2.4.*",
             "symfony/translation": "2.4.*"
         },
         "replace": {
@@ -1823,7 +1826,7 @@
         "suggest": {
             "doctrine/dbal": "Allow renaming columns and dropping SQLite columns."
         },
-        "time": "2014-04-19 18:02:02",
+        "time": "2014-05-11 17:20:27",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1851,7 +1854,7 @@
                 "name": "Taylor Otwell",
                 "email": "taylorotwell@gmail.com",
                 "homepage": "https://github.com/taylorotwell",
-                "role": "Developer"
+                "role": "Creator of Laravel"
             }
         ],
         "description": "The Laravel Framework.",
diff --git a/vendor/laravel/framework/.gitignore b/vendor/laravel/framework/.gitignore
index dbbf69fa9..10a34bbfd 100755
--- a/vendor/laravel/framework/.gitignore
+++ b/vendor/laravel/framework/.gitignore
@@ -2,3 +2,4 @@
 composer.phar
 composer.lock
 .DS_Store
+Thumbs.db
diff --git a/vendor/laravel/framework/CONTRIBUTING.md b/vendor/laravel/framework/CONTRIBUTING.md
index 272f03598..dafb4b8ad 100755
--- a/vendor/laravel/framework/CONTRIBUTING.md
+++ b/vendor/laravel/framework/CONTRIBUTING.md
@@ -14,7 +14,7 @@ Pull requests for bugs may be sent without creating any proposal issue. If you b
 
 ### Feature Requests
 
-If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on GitHub with `[Request]` in the title. The feature request will then be reviewed by a core contributor.
+If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on GitHub with `[Request]` in the title. The feature request will then be reviewed by @taylorotwell.
 
 ## Coding Guidelines
 
diff --git a/vendor/laravel/framework/composer.json b/vendor/laravel/framework/composer.json
index e9c7a7ba6..b0774358c 100755
--- a/vendor/laravel/framework/composer.json
+++ b/vendor/laravel/framework/composer.json
@@ -33,7 +33,7 @@
         "symfony/http-kernel": "2.4.*",
         "symfony/process": "2.4.*",
         "symfony/routing": "2.4.*",
-        "symfony/security": "2.4.*",
+        "symfony/security-core": "2.4.*",
         "symfony/translation": "2.4.*"
     },
     "replace": {
diff --git a/vendor/laravel/framework/readme.md b/vendor/laravel/framework/readme.md
index a8ee32381..ffed9b9ea 100755
--- a/vendor/laravel/framework/readme.md
+++ b/vendor/laravel/framework/readme.md
@@ -1,8 +1,8 @@
 ## Laravel Framework (Kernel)
 
-[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
-[![Total Downloads](https://img.shields.io/packagist/dm/laravel/framework.svg)](https://packagist.org/packages/laravel/framework)
-[![Latest Version](http://img.shields.io/github/tag/laravel/framework.svg)](https://github.com/laravel/framework/releases)
+[![Build Status](https://img.shields.io/travis/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
+[![Total Downloads](https://img.shields.io/packagist/dt/laravel/framework.svg)](https://packagist.org/packages/laravel/framework)
+[![Latest Version](https://img.shields.io/github/tag/laravel/framework.svg)](https://github.com/laravel/framework/releases)
 [![Dependency Status](https://www.versioneye.com/php/laravel:framework/badge.svg)](https://www.versioneye.com/php/laravel:framework)
 
 > **Note:** This repository contains the core code of the Laravel framework. If you want to build an application using Laravel 4, visit the main [Laravel repository](https://github.com/laravel/laravel).
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Guard.php b/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
index 3a406308e..e7a73e523 100755
--- a/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
@@ -402,7 +402,7 @@ public function attempting($callback)
 	 */
 	public function login(UserInterface $user, $remember = false)
 	{
-		$this->updateSession($id = $user->getAuthIdentifier());
+		$this->updateSession($user->getAuthIdentifier());
 
 		// If the user should be permanently "remembered" by the application we will
 		// queue a permanent cookie that contains the encrypted copy of the user
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
index 8ba5dfe1d..6537c09e5 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
@@ -73,7 +73,7 @@ public function increment($key, $value = 1)
 	}
 
 	/**
-	 * Increment the value of an item in the cache.
+	 * Decrement the value of an item in the cache.
 	 *
 	 * @param  string  $key
 	 * @param  mixed   $value
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
index 2d4626e6f..1d4a042fa 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
@@ -280,5 +280,4 @@ public function __call($method, $parameters)
 		}
 	}
 
-
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Container/Container.php b/vendor/laravel/framework/src/Illuminate/Container/Container.php
index 684bf71f3..7fd72c7ec 100755
--- a/vendor/laravel/framework/src/Illuminate/Container/Container.php
+++ b/vendor/laravel/framework/src/Illuminate/Container/Container.php
@@ -476,7 +476,7 @@ protected function getConcrete($abstract)
 	 */
 	protected function missingLeadingSlash($abstract)
 	{
-		return is_string($abstract) && ! starts_with($abstract, '\\');
+		return is_string($abstract) && strpos($abstract, '\\') !== 0;
 	}
 
 	/**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php b/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
index 639989234..812dd1cb4 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
@@ -24,10 +24,10 @@ class Manager {
 	 * @var \Illuminate\Database\DatabaseManager
 	 */
 	protected $manager;
-	
+
 	/**
 	 * The container instance.
-	 * 
+	 *
 	 * @var \Illuminate\Container\Container
 	 */
 	protected $container;
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
index bf66d8913..e3349675b 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
@@ -2187,7 +2187,7 @@ public function attributesToArray()
 		{
 			if ( ! array_key_exists($key, $attributes)) continue;
 
-			$attributes[$key] = $this->mutateAttribute(
+			$attributes[$key] = $this->mutateAttributeForArray(
 				$key, $attributes[$key]
 			);
 		}
@@ -2197,7 +2197,7 @@ public function attributesToArray()
 		// when we need to array or JSON the model for convenience to the coder.
 		foreach ($this->appends as $key)
 		{
-			$attributes[$key] = $this->mutateAttribute($key, null);
+			$attributes[$key] = $this->mutateAttributeForArray($key, null);
 		}
 
 		return $attributes;
@@ -2413,6 +2413,20 @@ protected function mutateAttribute($key, $value)
 		return $this->{'get'.studly_case($key).'Attribute'}($value);
 	}
 
+	/**
+	 * Get the value of an attribute using its mutator for array conversion.
+	 *
+	 * @param  string  $key
+	 * @param  mixed   $value
+	 * @return mixed
+	 */
+	protected function mutateAttributeForArray($key, $value)
+	{
+		$value = $this->mutateAttribute($key, $value);
+
+		return $value instanceof ArrayableInterface ? $value->toArray() : $value;
+	}
+
 	/**
 	 * Set a given attribute on the model.
 	 *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
index bae75cec3..e637a24e8 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -647,11 +647,16 @@ protected function attachNew(array $records, array $current, $touch = true)
 
 				$changes['attached'][] = (int) $id;
 			}
+
+			// Now we'll try to update an existing pivot record with the attributes that were
+			// given to the method. If the model is actually updated we will add it to the
+			// list of updated pivot records so we return them back out to the consumer.
 			elseif (count($attributes) > 0)
 			{
-				$this->updateExistingPivot($id, $attributes, $touch);
-
-				$changes['updated'][] = (int) $id;
+				if ($this->updateExistingPivot($id, $attributes, $touch))
+				{
+					$changes['updated'][] = (int) $id;
+				}
 			}
 		}
 		return $changes;
@@ -672,9 +677,11 @@ public function updateExistingPivot($id, array $attributes, $touch)
 			$attributes = $this->setTimestampsOnAttach($attributes, true);
 		}
 
-		$this->newPivotStatementForId($id)->update($attributes);
+		$updated = $this->newPivotStatementForId($id)->update($attributes);
 
 		if ($touch) $this->touchIfTouching();
+
+		return $updated;
 	}
 
 	/**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
index ad80fb9ab..122d4789b 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -87,6 +87,21 @@ public function match(array $models, Collection $results, $relation)
 		return $models;
 	}
 
+	/**
+	 * Associate the model instance to the given parent.
+	 *
+	 * @param  \Illuminate\Database\Eloquent\Model  $model
+	 * @return \Illuminate\Database\Eloquent\Model
+	 */
+	public function associate(Model $model)
+	{
+		$this->parent->setAttribute($this->foreignKey, $model->getKey());
+
+		$this->parent->setAttribute($this->morphType, get_class($model));
+
+		return $this->parent->setRelation($this->relation, $model);
+	}
+
 	/**
 	 * Get the results of the relationship.
 	 *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
index 982899b6b..7c1f0430f 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
@@ -127,6 +127,13 @@ class Builder {
 	 */
 	public $lock;
 
+	/**
+	 * The backups of fields while doing a pagination count.
+	 *
+	 * @var array
+	 */
+	protected $backups = array();
+
 	/**
 	 * The key that should be used when caching the query.
 	 *
@@ -1549,7 +1556,7 @@ protected function ungroupedPaginate($paginator, $perPage, $columns)
 	 */
 	public function getPaginationCount()
 	{
-		list($orders, $this->orders) = array($this->orders, null);
+		$this->backupFieldsForCount();
 
 		$columns = $this->columns;
 
@@ -1558,7 +1565,7 @@ public function getPaginationCount()
 		// the query. Once we have the count we will put them back onto this.
 		$total = $this->count();
 
-		$this->orders = $orders;
+		$this->restoreFieldsForCount();
 
 		// Once the query is run we need to put the old select columns back on the
 		// instance so that the select query will run properly. Otherwise, they
@@ -1568,6 +1575,37 @@ public function getPaginationCount()
 		return $total;
 	}
 
+	/**
+	 * Backup certain fields for a pagination count.
+	 *
+	 * @return void
+	 */
+	protected function backupFieldsForCount()
+	{
+		foreach (array('orders', 'limit', 'offset') as $field)
+		{
+			$this->backups[$field] = $this->{$field};
+
+			$this->{$field} = null;
+		}
+
+	}
+
+	/**
+	 * Restore certain fields for a pagination count.
+	 *
+	 * @return void
+	 */
+	protected function restoreFieldsForCount()
+	{
+		foreach (array('orders', 'limit', 'offset') as $field)
+		{
+			$this->{$field} = $this->backups[$field];
+		}
+
+		$this->backups = array();
+	}
+
 	/**
 	 * Determine if any rows exist for the current query.
 	 *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
index 51a0b4f50..43891d6c1 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
@@ -73,7 +73,7 @@ public function hasColumn($table, $column)
 	 * @param  string  $table
 	 * @return array
 	 */
-	protected function getColumnListing($table)
+	public function getColumnListing($table)
 	{
 		$table = $this->connection->getTablePrefix().$table;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
index a0a1d2e0f..747268154 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
@@ -25,7 +25,7 @@ public function hasTable($table)
 	 * @param  string  $table
 	 * @return array
 	 */
-	protected function getColumnListing($table)
+	public function getColumnListing($table)
 	{
 		$sql = $this->grammar->compileColumnExists();
 
diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
index f16f4b09e..c59c01661 100755
--- a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
+++ b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
@@ -190,7 +190,7 @@ protected function stripPadding($value)
 	{
 		$pad = ord($value[($len = strlen($value)) - 1]);
 
-		return $this->paddingIsValid($pad, $value) ? substr($value, 0, strlen($value) - $pad) : $value;
+		return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
 	}
 
 	/**
diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
index 9718f0ac7..c23095290 100755
--- a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": ">=5.3.0",
         "illuminate/support": "4.1.*",
-        "symfony/security": "2.4.*"
+        "symfony/security-core": "2.4.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*"
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/ConfigPublisher.php b/vendor/laravel/framework/src/Illuminate/Foundation/ConfigPublisher.php
index 44016a234..136a63496 100755
--- a/vendor/laravel/framework/src/Illuminate/Foundation/ConfigPublisher.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/ConfigPublisher.php
@@ -63,14 +63,12 @@ public function publish($package, $source)
 	 */
 	public function publishPackage($package, $packagePath = null)
 	{
-		list($vendor, $name) = explode('/', $package);
-
 		// First we will figure out the source of the package's configuration location
 		// which we do by convention. Once we have that we will move the files over
 		// to the "main" configuration directory for this particular application.
 		$path = $packagePath ?: $this->packagePath;
 
-		$source = $this->getSource($package, $name, $path);
+		$source = $this->getSource($package, $path);
 
 		return $this->publish($package, $source);
 	}
@@ -79,13 +77,12 @@ public function publishPackage($package, $packagePath = null)
 	 * Get the source configuration directory to publish.
 	 *
 	 * @param  string  $package
-	 * @param  string  $name
 	 * @param  string  $packagePath
 	 * @return string
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	protected function getSource($package, $name, $packagePath)
+	protected function getSource($package, $packagePath)
 	{
 		$source = $packagePath."/{$package}/src/config";
 
diff --git a/vendor/laravel/framework/src/Illuminate/Html/FormBuilder.php b/vendor/laravel/framework/src/Illuminate/Html/FormBuilder.php
index 9f50bf3de..53b880c7d 100755
--- a/vendor/laravel/framework/src/Illuminate/Html/FormBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Html/FormBuilder.php
@@ -639,7 +639,7 @@ protected function getCheckedState($type, $name, $value, $checked)
 	 */
 	protected function getCheckboxCheckedState($name, $value, $checked)
 	{
-		if ( ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
+		if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
 
 		if ($this->missingOldAndModel($name)) return $checked;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Request.php b/vendor/laravel/framework/src/Illuminate/Http/Request.php
index 1b4c38e3e..8023942e1 100755
--- a/vendor/laravel/framework/src/Illuminate/Http/Request.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Request.php
@@ -527,7 +527,7 @@ public static function createFromBase(SymfonyRequest $request)
 	{
 		if ($request instanceof static) return $request;
 
-		return with($self = new static)->duplicate(
+		return with(new static)->duplicate(
 
 			$request->query->all(), $request->request->all(), $request->attributes->all(),
 
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/Environment.php b/vendor/laravel/framework/src/Illuminate/Pagination/Environment.php
index 9f3cf1e88..83450f74b 100755
--- a/vendor/laravel/framework/src/Illuminate/Pagination/Environment.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/Environment.php
@@ -126,7 +126,7 @@ public function getPaginationView(Paginator $paginator, $view = null)
 	 */
 	public function getCurrentPage()
 	{
-		$page = (int) $this->currentPage ?: $this->request->query->get($this->pageName, 1);
+		$page = (int) $this->currentPage ?: $this->request->input($this->pageName, 1);
 
 		if ($page < 1 || filter_var($page, FILTER_VALIDATE_INT) === false)
 		{
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
index 8ff3c92a2..719eab125 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
@@ -106,6 +106,18 @@ public function pop($queue = null)
 		}
 	}
 
+	/**
+	 * Delete a message from the Beanstalk queue.
+	 *
+	 * @param  string  $queue
+	 * @param  string  $id
+	 * @return void
+	 */
+	public function deleteMessage($queue, $id)
+	{
+		$this->pheanstalk->useTube($this->getQueue($queue))->delete($id);
+	}
+
 	/**
 	 * Get the queue or return the default.
 	 *
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
index 477eeb2d7..86aeeca56 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -13,9 +13,7 @@ class SqsConnector implements ConnectorInterface {
 	 */
 	public function connect(array $config)
 	{
-		$sqsConfig = array_only($config, array('key', 'secret', 'region', 'default_cache_config'));
-
-		$sqs = SqsClient::factory($sqsConfig);
+		$sqs = SqsClient::factory($config);
 
 		return new SqsQueue($sqs, $config['queue']);
 	}
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Collection.php b/vendor/laravel/framework/src/Illuminate/Support/Collection.php
index a4138e81e..7cf0681b8 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Collection.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Collection.php
@@ -561,7 +561,7 @@ protected function valueRetriever($value)
 	{
 		return function($item) use ($value)
 		{
-			return is_object($item) ? $item->{$value} : array_get($item, $value);
+			return data_get($item, $value);
 		};
 	}
 
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
index cffc1722b..4755635b8 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
@@ -197,7 +197,7 @@ public static function setFacadeApplication($app)
 	 */
 	public static function __callStatic($method, $args)
 	{
-		$instance = static::resolveFacadeInstance(static::getFacadeAccessor());
+		$instance = static::getFacadeRoot();
 
 		switch (count($args))
 		{
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Manager.php b/vendor/laravel/framework/src/Illuminate/Support/Manager.php
index 8d4a773ae..7775a7d4a 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Manager.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Manager.php
@@ -47,7 +47,7 @@ public function driver($driver = null)
 		$driver = $driver ?: $this->getDefaultDriver();
 
 		// If the given driver has not been created before, we will create the instances
-		// here and cache it so we can return it next time very quickly. If their is
+		// here and cache it so we can return it next time very quickly. If there is
 		// already a driver created by this name, we'll just return that instance.
 		if ( ! isset($this->drivers[$driver]))
 		{
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Str.php b/vendor/laravel/framework/src/Illuminate/Support/Str.php
index e98c06be8..ba8e669e1 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Str.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Str.php
@@ -34,7 +34,7 @@ public static function camel($value)
 	/**
 	 * Determine if a given string contains a given substring.
 	 *
-	 * @param  string        $haystack
+	 * @param  string  $haystack
 	 * @param  string|array  $needles
 	 * @return bool
 	 */
@@ -51,8 +51,8 @@ public static function contains($haystack, $needles)
 	/**
 	 * Determine if a given string ends with a given substring.
 	 *
-	 * @param string $haystack
-	 * @param string|array $needles
+	 * @param string  $haystack
+	 * @param string|array  $needles
 	 * @return bool
 	 */
 	public static function endsWith($haystack, $needles)
diff --git a/vendor/laravel/framework/src/Illuminate/Support/helpers.php b/vendor/laravel/framework/src/Illuminate/Support/helpers.php
index 9d9237586..69b2701ae 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/helpers.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/helpers.php
@@ -485,7 +485,7 @@ function asset($path, $secure = null)
 	/**
 	 * Get the path to the base of the install.
 	 *
-	 * @param  string $path
+	 * @param  string  $path
 	 * @return string
 	 */
 	function base_path($path = '')
@@ -610,8 +610,8 @@ function e($value)
 	/**
 	 * Determine if a given string ends with a given substring.
 	 *
-	 * @param string $haystack
-	 * @param string|array $needle
+	 * @param string  $haystack
+	 * @param string|array  $needle
 	 * @return bool
 	 */
 	function ends_with($haystack, $needle)
@@ -769,7 +769,7 @@ function preg_replace_sub($pattern, &$replacements, $subject)
 	/**
 	 * Get the path to the public folder.
 	 *
-	 * @param  string $path
+	 * @param  string  $path
 	 * @return string
 	 */
 	function public_path($path = '')
@@ -857,7 +857,7 @@ function starts_with($haystack, $needle)
 	/**
 	 * Get the path to the storage folder.
 	 *
-	 * @param   string $path
+	 * @param   string  $path
 	 * @return  string
 	 */
 	function storage_path($path = '')
@@ -871,7 +871,7 @@ function storage_path($path = '')
 	/**
 	 * Determine if a given string contains a given substring.
 	 *
-	 * @param  string        $haystack
+	 * @param  string  $haystack
 	 * @param  string|array  $needle
 	 * @return bool
 	 */
@@ -945,12 +945,12 @@ function str_plural($value, $count = 2)
 if ( ! function_exists('str_random'))
 {
 	/**
-	 * Generate a "random" alpha-numeric string.
-	 *
-	 * Should not be considered sufficient for cryptography, etc.
+	 * Generate a more truly "random" alpha-numeric string.
 	 *
 	 * @param  int     $length
 	 * @return string
+	 *
+	 * @throws \RuntimeException
 	 */
 	function str_random($length = 16)
 	{
@@ -964,7 +964,7 @@ function str_random($length = 16)
 	 * Replace a given value in the string sequentially with an array.
 	 *
 	 * @param  string  $search
-	 * @param  array  $replace
+	 * @param  array   $replace
 	 * @param  string  $subject
 	 * @return string
 	 */
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
index e14192814..e852d068a 100755
--- a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
@@ -1087,7 +1087,7 @@ protected function validateMimes($attribute, $value, $parameters)
 	{
 		if ( ! $value instanceof File)
 		{
-			return true;
+			return false;
 		}
 
 		// The Symfony File class should do a decent job of guessing the extension
@@ -1684,7 +1684,7 @@ protected function replaceDateFormat($message, $attribute, $rule, $parameters)
 	 */
 	protected function replaceBefore($message, $attribute, $rule, $parameters)
 	{
-		if ( ! ($date = strtotime($parameters[0])))
+		if ( ! (strtotime($parameters[0])))
 		{
 			return str_replace(':date', $this->getAttribute($parameters[0]), $message);
 		}
@@ -1705,7 +1705,7 @@ protected function replaceBefore($message, $attribute, $rule, $parameters)
 	 */
 	protected function replaceAfter($message, $attribute, $rule, $parameters)
 	{
-		if ( ! ($date = strtotime($parameters[0])))
+		if ( ! (strtotime($parameters[0])))
 		{
 			return str_replace(':date', $this->getAttribute($parameters[0]), $message);
 		}
diff --git a/vendor/monolog/monolog/CHANGELOG.mdown b/vendor/monolog/monolog/CHANGELOG.mdown
index b7bff076e..d67599696 100755
--- a/vendor/monolog/monolog/CHANGELOG.mdown
+++ b/vendor/monolog/monolog/CHANGELOG.mdown
@@ -1,3 +1,9 @@
+### 1.9.1 (2014-04-24)
+
+  * Fixed regression in RotatingFileHandler file permissions
+  * Fixed initialization of the BufferHandler to make sure it gets flushed after receiving records
+  * Fixed ChromePHPHandler and FirePHPHandler's activation strategies to be more conservative
+
 ### 1.9.0 (2014-04-20)
 
   * Added LogEntriesHandler to send logs to a LogEntries account
diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
index 63dc773da..654710a8d 100755
--- a/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+++ b/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
@@ -69,7 +69,7 @@ public function format(array $record)
             $message = reset($message);
         }
 
-        if(isset($record['context'][self::TABLE])){
+        if (isset($record['context'][self::TABLE])) {
             $type  = 'TABLE';
             $label = $record['channel'] .': '. $record['message'];
             $message = $record['context'][self::TABLE];
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
index 6a8027339..183d239a6 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
@@ -28,6 +28,7 @@ class BufferHandler extends AbstractHandler
     protected $bufferLimit;
     protected $flushOnOverflow;
     protected $buffer = array();
+    protected $initialized = false;
 
     /**
      * @param HandlerInterface $handler         Handler.
@@ -42,9 +43,6 @@ public function __construct(HandlerInterface $handler, $bufferLimit = 0, $level
         $this->handler = $handler;
         $this->bufferLimit = (int) $bufferLimit;
         $this->flushOnOverflow = $flushOnOverflow;
-
-        // __destructor() doesn't get called on Fatal errors
-        register_shutdown_function(array($this, 'close'));
     }
 
     /**
@@ -56,6 +54,12 @@ public function handle(array $record)
             return false;
         }
 
+        if (!$this->initialized) {
+            // __destructor() doesn't get called on Fatal errors
+            register_shutdown_function(array($this, 'close'));
+            $this->initialized = true;
+        }
+
         if ($this->bufferLimit > 0 && $this->bufferSize === $this->bufferLimit) {
             if ($this->flushOnOverflow) {
                 $this->flush();
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
index ee92e3ca7..ff7a7809d 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
@@ -100,15 +100,19 @@ protected function write(array $record)
      */
     protected function send()
     {
-        if (self::$overflowed) {
+        if (self::$overflowed || !self::$sendHeaders) {
             return;
         }
 
         if (!self::$initialized) {
+            self::$initialized = true;
+
             self::$sendHeaders = $this->headersAccepted();
-            self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+            if (!self::$sendHeaders) {
+                return;
+            }
 
-            self::$initialized = true;
+            self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
         }
 
         $json = @json_encode(self::$json);
@@ -155,8 +159,11 @@ protected function sendHeader($header, $content)
      */
     protected function headersAccepted()
     {
-        return !isset($_SERVER['HTTP_USER_AGENT'])
-               || preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']);
+        if (empty($_SERVER['HTTP_USER_AGENT'])) {
+            return false;
+        }
+
+        return preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']);
     }
 
     /**
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
index b233f14c8..fee479508 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
@@ -131,15 +131,22 @@ protected function sendHeader($header, $content)
      */
     protected function write(array $record)
     {
+        if (!self::$sendHeaders) {
+            return;
+        }
+
         // WildFire-specific headers must be sent prior to any messages
         if (!self::$initialized) {
+            self::$initialized = true;
+
             self::$sendHeaders = $this->headersAccepted();
+            if (!self::$sendHeaders) {
+                return;
+            }
 
             foreach ($this->getInitHeaders() as $header => $content) {
                 $this->sendHeader($header, $content);
             }
-
-            self::$initialized = true;
         }
 
         $header = $this->createRecordHeader($record);
@@ -155,9 +162,11 @@ protected function write(array $record)
      */
     protected function headersAccepted()
     {
-        return !isset($_SERVER['HTTP_USER_AGENT'])
-               || preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])
-               || isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
+        if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])) {
+            return true;
+        }
+
+        return isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
     }
 
     /**
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
index f49eb032c..18b3fa4f6 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
@@ -12,7 +12,6 @@
 namespace Monolog\Handler;
 
 use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
 
 /**
  * @author Robert Kaufmann III <rok3@rok3.me>
@@ -55,4 +54,4 @@ protected function generateDataStream($record)
         return $this->logToken . ' ' . $record['formatted'];
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
index 2a4fba410..2c80afe7a 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
@@ -30,16 +30,16 @@ class PushoverHandler extends SocketHandler
 
     private $highPriorityLevel;
     private $emergencyLevel;
-    
+
     /**
      * Sounds the api supports by default
      * @see https://pushover.net/api#sounds
      * @var array
      */
     private $sounds = array(
-    	'pushover', 'bike', 'bugle', 'cashregister', 'classical', 'cosmic', 'falling', 'gamelan', 'incoming',
-    	'intermission', 'magic', 'mechanical', 'pianobar', 'siren', 'spacealarm', 'tugboat', 'alien', 'climb',
-    	'persistent', 'echo', 'updown', 'none',
+        'pushover', 'bike', 'bugle', 'cashregister', 'classical', 'cosmic', 'falling', 'gamelan', 'incoming',
+        'intermission', 'magic', 'mechanical', 'pianobar', 'siren', 'spacealarm', 'tugboat', 'alien', 'climb',
+        'persistent', 'echo', 'updown', 'none',
     );
 
     /**
@@ -100,7 +100,7 @@ private function buildContent($record)
         } elseif ($record['level'] >= $this->highPriorityLevel) {
             $dataArray['priority'] = 1;
         }
-        
+
         if (isset($record['context']['sound']) && in_array($record['context']['sound'], $this->sounds)) {
             $dataArray['sound'] = $record['context']['sound'];
         } elseif (isset($record['extra']['sound']) && in_array($record['extra']['sound'], $this->sounds)) {
diff --git a/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
index 5d694f32b..6213d6ee5 100755
--- a/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+++ b/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
@@ -33,12 +33,12 @@ class RotatingFileHandler extends StreamHandler
 
     /**
      * @param string  $filename
-     * @param integer $maxFiles         The maximal amount of files to keep (0 means unlimited)
-     * @param integer $level            The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble           Whether the messages that are handled can bubble up the stack or not
-     * @param int     $filePermissions  Optional file permissions (default (0644) are only for owner read/write)
+     * @param integer $maxFiles        The maximal amount of files to keep (0 means unlimited)
+     * @param integer $level           The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble          Whether the messages that are handled can bubble up the stack or not
+     * @param int     $filePermissions Optional file permissions (default (0644) are only for owner read/write)
      */
-    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = 0644)
+    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null)
     {
         $this->filename = $filename;
         $this->maxFiles = (int) $maxFiles;
diff --git a/vendor/monolog/monolog/src/Monolog/Logger.php b/vendor/monolog/monolog/src/Monolog/Logger.php
index 4a74db351..3e3f95cea 100755
--- a/vendor/monolog/monolog/src/Monolog/Logger.php
+++ b/vendor/monolog/monolog/src/Monolog/Logger.php
@@ -103,7 +103,7 @@ class Logger implements LoggerInterface
     );
 
     /**
-     * @var DateTimeZone
+     * @var \DateTimeZone
      */
     protected static $timezone;
 
@@ -172,6 +172,14 @@ public function popHandler()
         return array_shift($this->handlers);
     }
 
+    /**
+     * @return HandlerInterface[]
+     */
+    public function getHandlers()
+    {
+        return $this->handlers;
+    }
+
     /**
      * Adds a processor on to the stack.
      *
@@ -199,6 +207,14 @@ public function popProcessor()
         return array_shift($this->processors);
     }
 
+    /**
+     * @return callable[]
+     */
+    public function getProcessors()
+    {
+        return $this->processors;
+    }
+
     /**
      * Adds a log record.
      *
diff --git a/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
index 653ae8ca9..7e53f4701 100755
--- a/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+++ b/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
@@ -29,7 +29,7 @@ abstract class MemoryProcessor
     protected $useFormatting;
 
     /**
-     * @param boolean $realUsage Set this to true to get the real size of memory allocated from system.
+     * @param boolean $realUsage     Set this to true to get the real size of memory allocated from system.
      * @param boolean $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
      */
     public function __construct($realUsage = true, $useFormatting = true)
@@ -41,7 +41,7 @@ public function __construct($realUsage = true, $useFormatting = true)
     /**
      * Formats bytes into a human readable string if $this->useFormatting is true, otherwise return $bytes as is
      *
-     * @param  int    $bytes
+     * @param  int        $bytes
      * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as is
      */
     protected function formatBytes($bytes)
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
index 9fa4d5068..2f55faf8e 100755
--- a/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
+++ b/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
@@ -22,6 +22,7 @@ class ChromePHPHandlerTest extends TestCase
     protected function setUp()
     {
         TestChromePHPHandler::reset();
+        $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0';
     }
 
     public function testHeaders()
@@ -124,6 +125,7 @@ public static function reset()
     {
         self::$initialized = false;
         self::$overflowed = false;
+        self::$sendHeaders = true;
         self::$json['rows'] = array();
     }
 
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
index 2b7b76d98..0eb10a63f 100755
--- a/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
+++ b/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
@@ -22,6 +22,7 @@ class FirePHPHandlerTest extends TestCase
     public function setUp()
     {
         TestFirePHPHandler::reset();
+        $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0';
     }
 
     public function testHeaders()
@@ -79,6 +80,7 @@ class TestFirePHPHandler extends FirePHPHandler
     public static function reset()
     {
         self::$initialized = false;
+        self::$sendHeaders = true;
         self::$messageIndex = 1;
     }
 
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
index 5a3f9755f..7af60be84 100755
--- a/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
+++ b/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
@@ -13,7 +13,6 @@
 
 use Monolog\TestCase;
 use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
 
 /**
  * @author Robert Kaufmann III <rok3@rok3.me>
@@ -43,10 +42,10 @@ public function testWriteContent()
 
     public function testWriteBatchContent()
     {
-        $records = array( 
-            $this->getRecord(), 
-            $this->getRecord(), 
-            $this->getRecord() 
+        $records = array(
+            $this->getRecord(),
+            $this->getRecord(),
+            $this->getRecord()
         );
         $this->createHandler();
         $this->handler->handleBatch($records);
diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
index 946d44400..8fe86961a 100755
--- a/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
+++ b/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
@@ -72,7 +72,7 @@ public function testWarning()
         $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']);
         $this->assertContains($record['message'], $ravenClient->lastData['message']);
     }
-    
+
     public function testTag()
     {
         $ravenClient = $this->getRavenClient();
diff --git a/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php b/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
index eef22d7a0..851a9dc2a 100755
--- a/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
+++ b/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
@@ -23,7 +23,7 @@ public function testProcessor()
         $tags = array(1, 2, 3);
         $processor = new TagProcessor($tags);
         $record = $processor($this->getRecord());
-        
+
         $this->assertEquals($tags, $record['extra']['tags']);
     }
 }
diff --git a/vendor/nesbot/carbon/history.md b/vendor/nesbot/carbon/history.md
index 3ed8595f5..72b1691cc 100755
--- a/vendor/nesbot/carbon/history.md
+++ b/vendor/nesbot/carbon/history.md
@@ -1,3 +1,9 @@
+1.9.0 / 2014-05-12
+==================
+* Changed self references to static to allow for easier child classes
+* Fixed a couple of tests to account for London DST
+* Fixed a test that failed due to inconsistent DateTime COOKIE strings
+
 1.8.0 / 2014-01-06
 ==================
 * Added .gitattributes file to to ignore some files on export (thanks @lucasmichot)
diff --git a/vendor/nesbot/carbon/src/Carbon/Carbon.php b/vendor/nesbot/carbon/src/Carbon/Carbon.php
index 529ceb877..fe3e37b5a 100755
--- a/vendor/nesbot/carbon/src/Carbon/Carbon.php
+++ b/vendor/nesbot/carbon/src/Carbon/Carbon.php
@@ -163,9 +163,9 @@ public function __construct($time = null, $tz = null)
    {
       // If the class has a test now set and we are trying to create a now()
       // instance then override as required
-      if (static::hasTestNow() && (empty($time) || $time === 'now' || self::hasRelativeKeywords($time))) {
+      if (static::hasTestNow() && (empty($time) || $time === 'now' || static::hasRelativeKeywords($time))) {
          $testInstance = clone static::getTestNow();
-         if (self::hasRelativeKeywords($time)) {
+         if (static::hasRelativeKeywords($time)) {
    	     $testInstance->modify($time);
          }
 
@@ -180,7 +180,7 @@ public function __construct($time = null, $tz = null)
       }
 
       if ($tz !== null) {
-         parent::__construct($time, self::safeCreateDateTimeZone($tz));
+         parent::__construct($time, static::safeCreateDateTimeZone($tz));
       } else {
          parent::__construct($time);
       }
@@ -298,7 +298,7 @@ public static function create($year = null, $month = null, $day = null, $hour =
          $second = ($second === null) ? 0 : $second;
       }
 
-      return self::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
+      return static::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
    }
 
    /**
@@ -313,7 +313,7 @@ public static function create($year = null, $month = null, $day = null, $hour =
     */
    public static function createFromDate($year = null, $month = null, $day = null, $tz = null)
    {
-      return self::create($year, $month, $day, null, null, null, $tz);
+      return static::create($year, $month, $day, null, null, null, $tz);
    }
 
    /**
@@ -328,7 +328,7 @@ public static function createFromDate($year = null, $month = null, $day = null,
     */
    public static function createFromTime($hour = null, $minute = null, $second = null, $tz = null)
    {
-      return self::create(null, null, null, $hour, $minute, $second, $tz);
+      return static::create(null, null, null, $hour, $minute, $second, $tz);
    }
 
    /**
@@ -345,13 +345,13 @@ public static function createFromTime($hour = null, $minute = null, $second = nu
    public static function createFromFormat($format, $time, $tz = null)
    {
       if ($tz !== null) {
-         $dt = parent::createFromFormat($format, $time, self::safeCreateDateTimeZone($tz));
+         $dt = parent::createFromFormat($format, $time, static::safeCreateDateTimeZone($tz));
       } else {
          $dt = parent::createFromFormat($format, $time);
       }
 
       if ($dt instanceof DateTime) {
-         return self::instance($dt);
+         return static::instance($dt);
       }
 
       $errors = static::getLastErrors();
@@ -368,7 +368,7 @@ public static function createFromFormat($format, $time, $tz = null)
     */
    public static function createFromTimestamp($timestamp, $tz = null)
    {
-      return self::now($tz)->setTimestamp($timestamp);
+      return static::now($tz)->setTimestamp($timestamp);
    }
 
    /**
@@ -390,7 +390,7 @@ public static function createFromTimestampUTC($timestamp)
     */
    public function copy()
    {
-      return self::instance($this);
+      return static::instance($this);
    }
 
    ///////////////////////////////////////////////////////////////////
@@ -719,7 +719,7 @@ public function tz($value)
     */
    public function setTimezone($value)
    {
-      parent::setTimezone(self::safeCreateDateTimeZone($value));
+      parent::setTimezone(static::safeCreateDateTimeZone($value));
 
       return $this;
    }
@@ -785,7 +785,7 @@ public static function hasRelativeKeywords($time) {
          return false;
       }
 
-      foreach(self::$relativeKeywords as $keyword) {
+      foreach(static::$relativeKeywords as $keyword) {
          if (stripos($time, $keyword) !== false) {
             return true;
         }
@@ -806,7 +806,7 @@ public static function hasRelativeKeywords($time) {
     *
     * @return string
     */
-   public function formatLocalized($format)
+   public function formatLocalized($format = self::COOKIE)
    {
       // Check for Windows to find and replace the %e
       // modifier correctly
@@ -1161,7 +1161,7 @@ public function isWeekend()
     */
    public function isYesterday()
    {
-      return $this->toDateString() === self::now($this->tz)->subDay()->toDateString();
+      return $this->toDateString() === static::now($this->tz)->subDay()->toDateString();
    }
 
    /**
@@ -1171,7 +1171,7 @@ public function isYesterday()
     */
    public function isToday()
    {
-      return $this->toDateString() === self::now($this->tz)->toDateString();
+      return $this->toDateString() === static::now($this->tz)->toDateString();
    }
 
    /**
@@ -1181,7 +1181,7 @@ public function isToday()
     */
    public function isTomorrow()
    {
-      return $this->toDateString() === self::now($this->tz)->addDay()->toDateString();
+      return $this->toDateString() === static::now($this->tz)->addDay()->toDateString();
    }
 
    /**
@@ -1191,7 +1191,7 @@ public function isTomorrow()
     */
    public function isFuture()
    {
-      return $this->gt(self::now($this->tz));
+      return $this->gt(static::now($this->tz));
    }
 
    /**
diff --git a/vendor/nesbot/carbon/tests/ConstructTest.php b/vendor/nesbot/carbon/tests/ConstructTest.php
index 1f1226647..a78a0c041 100755
--- a/vendor/nesbot/carbon/tests/ConstructTest.php
+++ b/vendor/nesbot/carbon/tests/ConstructTest.php
@@ -54,27 +54,47 @@ public function testParseWithDefaultTimezone()
 
    public function testSettingTimezone()
    {
-      $c = new Carbon('now', new \DateTimeZone('Europe/London'));
-      $this->assertSame('Europe/London', $c->tzName);
-      $this->assertSame(0, $c->offsetHours);
+      $timezone = 'Europe/London';
+      $dtz = new \DateTimeZone($timezone);
+      $dt = new \DateTime('now', $dtz);
+      $dayLightSavingTimeOffset = $dt->format('I');
+
+      $c = new Carbon('now', $dtz);
+      $this->assertSame($timezone, $c->tzName);
+      $this->assertSame(0 + $dayLightSavingTimeOffset, $c->offsetHours);
    }
    public function testParseSettingTimezone()
    {
-      $c = Carbon::parse('now', new \DateTimeZone('Europe/London'));
-      $this->assertSame('Europe/London', $c->tzName);
-      $this->assertSame(0, $c->offsetHours);
+      $timezone = 'Europe/London';
+      $dtz = new \DateTimeZone($timezone);
+      $dt = new \DateTime('now', $dtz);
+      $dayLightSavingTimeOffset = $dt->format('I');
+
+      $c = Carbon::parse('now', $dtz);
+      $this->assertSame($timezone, $c->tzName);
+      $this->assertSame(0 + $dayLightSavingTimeOffset, $c->offsetHours);
    }
 
    public function testSettingTimezoneWithString()
    {
-      $c = new Carbon('now', 'Asia/Tokyo');
-      $this->assertSame('Asia/Tokyo', $c->tzName);
-      $this->assertSame(9, $c->offsetHours);
+      $timezone = 'Asia/Tokyo';
+      $dtz = new \DateTimeZone($timezone);
+      $dt = new \DateTime('now', $dtz);
+      $dayLightSavingTimeOffset = $dt->format('I');
+
+      $c = new Carbon('now', $timezone);
+      $this->assertSame($timezone, $c->tzName);
+      $this->assertSame(9 + $dayLightSavingTimeOffset, $c->offsetHours);
    }
    public function testParseSettingTimezoneWithString()
    {
-      $c = Carbon::parse('now', 'Asia/Tokyo');
-      $this->assertSame('Asia/Tokyo', $c->tzName);
-      $this->assertSame(9, $c->offsetHours);
+      $timezone = 'Asia/Tokyo';
+      $dtz = new \DateTimeZone($timezone);
+      $dt = new \DateTime('now', $dtz);
+      $dayLightSavingTimeOffset = $dt->format('I');
+
+      $c = Carbon::parse('now', $timezone);
+      $this->assertSame($timezone, $c->tzName);
+      $this->assertSame(9 + $dayLightSavingTimeOffset, $c->offsetHours);
    }
 }
diff --git a/vendor/nesbot/carbon/tests/StringsTest.php b/vendor/nesbot/carbon/tests/StringsTest.php
index 8a407f45b..e893ed0d7 100755
--- a/vendor/nesbot/carbon/tests/StringsTest.php
+++ b/vendor/nesbot/carbon/tests/StringsTest.php
@@ -93,7 +93,12 @@ public function testToATOMString()
    public function testToCOOKIEString()
    {
       $d = Carbon::create(1975, 12, 25, 14, 15, 16);
-      $this->assertSame('Thursday, 25-Dec-75 14:15:16 EST', $d->toCOOKIEString());
+      if( \DateTime::COOKIE === 'l, d-M-y H:i:s T' )
+          $cookieString = 'Thursday, 25-Dec-75 14:15:16 EST';
+      else
+          $cookieString = 'Thursday, 25-Dec-1975 14:15:16 EST';
+
+      $this->assertSame($cookieString, $d->toCOOKIEString());
    }
    public function testToISO8601String()
    {
diff --git a/vendor/patchwork/utf8/CHANGELOG.md b/vendor/patchwork/utf8/CHANGELOG.md
index 3289f8db5..75bb03e03 100755
--- a/vendor/patchwork/utf8/CHANGELOG.md
+++ b/vendor/patchwork/utf8/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.1.22 (2014-04-06)
+
+- fix #19: don't call ini_set() when not required and gain compat with PHP5.6
+
 ## v1.1.21 (2014-03-26)
 
 - fix #18 u::wordwrap() now relies on native behavior
diff --git a/vendor/patchwork/utf8/class/Patchwork/Utf8/Bootup.php b/vendor/patchwork/utf8/class/Patchwork/Utf8/Bootup.php
index fc75d6755..4716ff5c3 100755
--- a/vendor/patchwork/utf8/class/Patchwork/Utf8/Bootup.php
+++ b/vendor/patchwork/utf8/class/Patchwork/Utf8/Bootup.php
@@ -54,25 +54,21 @@ static function initMbstring()
             if ('utf-8' !== strtolower(mb_internal_encoding()))
             {
                 mb_internal_encoding('UTF-8');
-                ini_set('mbstring.internal_encoding', 'UTF-8');
             }
 
             if ('none' !== strtolower(mb_substitute_character()))
             {
                 mb_substitute_character('none');
-                ini_set('mbstring.substitute_character', 'none');
             }
 
             if (!in_array(strtolower(mb_http_output()), array('pass', '8bit')))
             {
                 mb_http_output('pass');
-                ini_set('mbstring.http_output', 'pass');
             }
 
             if (!in_array(strtolower(mb_language()), array('uni', 'neutral')))
             {
                 mb_language('uni');
-                ini_set('mbstring.language', 'uni');
             }
         }
         else if (!defined('MB_OVERLOAD_MAIL'))
@@ -90,19 +86,16 @@ static function initIconv()
             if ('UTF-8' !== iconv_get_encoding('input_encoding'))
             {
                 iconv_set_encoding('input_encoding', 'UTF-8');
-                ini_set('iconv.input_encoding', 'UTF-8');
             }
 
             if ('UTF-8' !== iconv_get_encoding('internal_encoding'))
             {
                 iconv_set_encoding('internal_encoding', 'UTF-8');
-                ini_set('iconv.internal_encoding', 'UTF-8');
             }
 
             if ('UTF-8' !== iconv_get_encoding('output_encoding'))
             {
                 iconv_set_encoding('output_encoding' , 'UTF-8');
-                ini_set('iconv.output_encoding', 'UTF-8');
             }
         }
         else if (!defined('ICONV_IMPL'))
diff --git a/vendor/phpseclib/phpseclib/build/code-sniffer-ruleset.xml b/vendor/phpseclib/phpseclib/build/code-sniffer-ruleset.xml
index 9da1625ab..a0a5fc8a4 100755
--- a/vendor/phpseclib/phpseclib/build/code-sniffer-ruleset.xml
+++ b/vendor/phpseclib/phpseclib/build/code-sniffer-ruleset.xml
@@ -27,7 +27,6 @@
    <exclude name="PEAR.Commenting.FunctionComment.SpacingBeforeTags" />
    <exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket" />
    <exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine" />
-   <exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
    <exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" />
    <exclude name="PEAR.WhiteSpace.ScopeClosingBrace.BreakIdent" />
    <exclude name="PEAR.WhiteSpace.ScopeClosingBrace.Indent" />
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 018c11989..58fba1d6d 100755
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -755,8 +755,8 @@ function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
                     strlen('ssh-rsa'), 'ssh-rsa', strlen($raw['publicExponent']), $raw['publicExponent'], strlen($raw['modulus']), $raw['modulus']
                 );
                 $source = pack('Na*Na*Na*Na*',
-                              strlen('ssh-rsa'), 'ssh-rsa', strlen($encryption), $encryption,
-                              strlen($this->comment), $this->comment, strlen($public), $public
+                    strlen('ssh-rsa'), 'ssh-rsa', strlen($encryption), $encryption,
+                    strlen($this->comment), $this->comment, strlen($public), $public
                 );
                 $public = base64_encode($public);
                 $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
index 70a59a4f6..54f65b29b 100755
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
@@ -288,8 +288,12 @@ function encrypt($plaintext)
         // if the key is smaller then 8, do what we'd normally do
         if ($this->mode_3cbc && strlen($this->key) > 8) {
             return $this->des[2]->encrypt(
-                   $this->des[1]->decrypt(
-                   $this->des[0]->encrypt($this->_pad($plaintext))));
+                $this->des[1]->decrypt(
+                    $this->des[0]->encrypt(
+                        $this->_pad($plaintext)
+                    )
+                )
+            );
         }
 
         return parent::encrypt($plaintext);
@@ -306,9 +310,15 @@ function encrypt($plaintext)
     function decrypt($ciphertext)
     {
         if ($this->mode_3cbc && strlen($this->key) > 8) {
-            return $this->_unpad($this->des[0]->decrypt(
-                                 $this->des[1]->encrypt(
-                                 $this->des[2]->decrypt(str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, "\0")))));
+            return $this->_unpad(
+                $this->des[0]->decrypt(
+                    $this->des[1]->encrypt(
+                        $this->des[2]->decrypt(
+                            str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, "\0")
+                        )
+                    )
+                )
+            );
         }
 
         return parent::decrypt($ciphertext);
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
index a88ed1ae8..d87911745 100755
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
@@ -707,10 +707,12 @@ function _encryptBlock($in)
             $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
         }
 
+        // @codingStandardsIgnoreStart
         return pack("V4", $K[4] ^ $R2,
                           $K[5] ^ $R3,
                           $K[6] ^ $R0,
                           $K[7] ^ $R1);
+        // @codingStandardsIgnoreEnd
     }
 
     /**
@@ -761,10 +763,12 @@ function _decryptBlock($in)
             $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
         }
 
+        // @codingStandardsIgnoreStart
         return pack("V4", $K[0] ^ $R2,
                           $K[1] ^ $R3,
                           $K[2] ^ $R0,
                           $K[3] ^ $R1);
+        // @codingStandardsIgnoreEnd
     }
 
     /**
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
index da70d415a..2774e7e8f 100755
--- a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
@@ -950,6 +950,9 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
             case FILE_ASN1_TYPE_INTEGER:
             case FILE_ASN1_TYPE_ENUMERATED:
                 if (!isset($mapping['mapping'])) {
+                    if (is_numeric($source)) {
+                        $source = new Math_BigInteger($source);
+                    }
                     $value = $source->toBytes(true);
                 } else {
                     $value = array_search($source, $mapping['mapping']);
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
index 51eac0ded..f32831d94 100755
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
@@ -19,10 +19,6 @@
  * which only supports integers.  Although this fact will slow this library down, the fact that such a high
  * base is being used should more than compensate.
  *
- * When PHP version 6 is officially released, we'll be able to use 64-bit integers.  This should, once again,
- * allow bitwise operators, and will increase the maximum possible base to 2**31 (or 2**62 for addition /
- * subtraction).
- *
  * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
  * (new Math_BigInteger(pow(2, 26)))->value = array(0, 1)
  *
@@ -924,7 +920,7 @@ function _add($x_value, $x_negative, $y_value, $y_negative)
             $carry = $sum >= MATH_BIGINTEGER_MAX_DIGIT2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
             $sum = $carry ? $sum - MATH_BIGINTEGER_MAX_DIGIT2 : $sum;
 
-            $temp = (int) ($sum / MATH_BIGINTEGER_BASE_FULL);
+            $temp = MATH_BIGINTEGER_BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
 
             $value[$i] = (int) ($sum - MATH_BIGINTEGER_BASE_FULL * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
             $value[$j] = $temp;
@@ -1060,7 +1056,7 @@ function _subtract($x_value, $x_negative, $y_value, $y_negative)
             $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
             $sum = $carry ? $sum + MATH_BIGINTEGER_MAX_DIGIT2 : $sum;
 
-            $temp = (int) ($sum / MATH_BIGINTEGER_BASE_FULL);
+            $temp = MATH_BIGINTEGER_BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
 
             $x_value[$i] = (int) ($sum - MATH_BIGINTEGER_BASE_FULL * $temp);
             $x_value[$j] = $temp;
@@ -1208,7 +1204,7 @@ function _regularMultiply($x_value, $y_value)
 
         for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
             $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
             $product_value[$j] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
         }
 
@@ -1221,7 +1217,7 @@ function _regularMultiply($x_value, $y_value)
 
             for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
                 $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
                 $product_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
             }
 
@@ -1309,13 +1305,13 @@ function _baseSquare($value)
             $i2 = $i << 1;
 
             $temp = $square_value[$i2] + $value[$i] * $value[$i];
-            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
             $square_value[$i2] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
 
             // note how we start from $i+1 instead of 0 as we do in multiplication.
             for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
                 $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
-                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
                 $square_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
             }
 
@@ -1513,9 +1509,8 @@ function divide($y)
             if ($x_window[0] == $y_window[0]) {
                 $quotient_value[$q_index] = MATH_BIGINTEGER_MAX_DIGIT;
             } else {
-                $quotient_value[$q_index] = (int) (
-                    ($x_window[0] * MATH_BIGINTEGER_BASE_FULL + $x_window[1])
-                    /
+                $quotient_value[$q_index] = $this->_safe_divide(
+                    $x_window[0] * MATH_BIGINTEGER_BASE_FULL + $x_window[1],
                     $y_window[0]
                 );
             }
@@ -1583,7 +1578,7 @@ function _divide_digit($dividend, $divisor)
 
         for ($i = count($dividend) - 1; $i >= 0; --$i) {
             $temp = MATH_BIGINTEGER_BASE_FULL * $carry + $dividend[$i];
-            $result[$i] = (int) ($temp / $divisor);
+            $result[$i] = $this->_safe_divide($temp, $divisor);
             $carry = (int) ($temp - $divisor * $result[$i]);
         }
 
@@ -2200,7 +2195,7 @@ function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
 
         for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
             $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
             $product_value[$j] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
         }
 
@@ -2216,7 +2211,7 @@ function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
 
             for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
                 $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
                 $product_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
             }
 
@@ -2265,7 +2260,7 @@ function _montgomery($x, $n)
 
         for ($i = 0; $i < $k; ++$i) {
             $temp = $result[MATH_BIGINTEGER_VALUE][$i] * $cache[MATH_BIGINTEGER_DATA][$key];
-            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $temp - MATH_BIGINTEGER_BASE_FULL * (MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
             $temp = $this->_regularMultiply(array($temp), $n);
             $temp = array_merge($this->_array_repeat(0, $i), $temp);
             $result = $this->_add($result[MATH_BIGINTEGER_VALUE], false, $temp, false);
@@ -2322,9 +2317,9 @@ function _montgomeryMultiply($x, $y, $m)
         $a = array(MATH_BIGINTEGER_VALUE => $this->_array_repeat(0, $n + 1));
         for ($i = 0; $i < $n; ++$i) {
             $temp = $a[MATH_BIGINTEGER_VALUE][0] + $x[$i] * $y[0];
-            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $temp - MATH_BIGINTEGER_BASE_FULL * (MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
             $temp = $temp * $cache[MATH_BIGINTEGER_DATA][$key];
-            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $temp - MATH_BIGINTEGER_BASE_FULL * (MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
             $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
             $a = $this->_add($a[MATH_BIGINTEGER_VALUE], false, $temp[MATH_BIGINTEGER_VALUE], false);
             $a[MATH_BIGINTEGER_VALUE] = array_slice($a[MATH_BIGINTEGER_VALUE], 1);
@@ -3464,7 +3459,7 @@ function _lshift($shift)
 
         for ($i = 0; $i < count($this->value); ++$i) {
             $temp = $this->value[$i] * $shift + $carry;
-            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $carry = MATH_BIGINTEGER_BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
             $this->value[$i] = (int) ($temp - $carry * MATH_BIGINTEGER_BASE_FULL);
         }
 
@@ -3712,4 +3707,27 @@ function _encodeASN1Length($length)
         $temp = ltrim(pack('N', $length), chr(0));
         return pack('Ca*', 0x80 | strlen($temp), $temp);
     }
+
+    /**
+     * Single digit division
+     *
+     * Even if int64 is being used the division operator will return a float64 value
+     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
+     * have the precision of int64 this is a problem so, when int64 is being used,
+     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
+     *
+     * @access private
+     * @param Integer $x
+     * @param Integer $y
+     * @return Integer
+     */
+    function _safe_divide($x, $y)
+    {
+        if (MATH_BIGINTEGER_BASE === 26) {
+            return (int) ($x / $y);
+        }
+
+        // MATH_BIGINTEGER_BASE === 31
+        return ($x - ($x % $y)) / $y;
+    }
 }
diff --git a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/InternalTest.php b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/InternalTest.php
index b02923197..744b2df14 100755
--- a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/InternalTest.php
+++ b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/InternalTest.php
@@ -14,4 +14,11 @@ static public function setUpBeforeClass()
         self::ensureConstant('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_INTERNAL);
         self::ensureConstant('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
     }
+
+    public function testInternalRepresentation()
+    {
+        $x = new Math_BigInteger('FFFFFFFFFFFFFFFFC90FDA', 16);
+        $y = new Math_BigInteger("$x");
+        $this->assertSame($x->value, $y->value);
+    }
 }
diff --git a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php
index ea9d4e2b6..d62dcec52 100755
--- a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php
+++ b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php
@@ -265,4 +265,69 @@ public function testClone()
         $this->assertSame('18446744073709551616', (string) $x);
         $this->assertSame('18446744073709551616', (string) $y);
     }
+
+    /**
+    * @group github279
+    */
+    public function testDiffieHellmanKeyAgreement()
+    {
+        if (getenv('TRAVIS') && PHP_VERSION === '5.3.3'
+            && MATH_BIGINTEGER_MODE === MATH_BIGINTEGER_MODE_INTERNAL
+        ) {
+            $this->markTestIncomplete(
+                'This test hangs on PHP 5.3.3 using internal mode.'
+            );
+        }
+
+        // "Oakley Group 14" 2048-bit modular exponentiation group as used in
+        // SSH2 diffie-hellman-group14-sha1
+        $prime = $this->getInstance(
+            'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1' .
+            '29024E088A67CC74020BBEA63B139B22514A08798E3404DD' .
+            'EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245' .
+            'E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+            'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D' .
+            'C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F' .
+            '83655D23DCA3AD961C62F356208552BB9ED529077096966D' .
+            '670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+            'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9' .
+            'DE2BCBF6955817183995497CEA956AE515D2261898FA0510' .
+            '15728E5A8AACAA68FFFFFFFFFFFFFFFF',
+            16
+        );
+        $generator = $this->getInstance(2);
+
+        /*
+        Code for generation of $alicePrivate and $bobPrivate.
+        $one = $this->getInstance(1);
+        $max = $one->bitwise_leftShift(512)->subtract($one);
+        $alicePrivate = $one->random($one, $max);
+        $bobPrivate = $one->random($one, $max);
+        var_dump($alicePrivate->toHex(), $bobPrivate->toHex());
+        */
+
+        $alicePrivate = $this->getInstance(
+            '22606EDA7960458BC9D65F46DD96F114F9A004F0493C1F26' .
+            '2139D2C8063B733162E876182CA3BF063AB1A167ABDB7F03' .
+            'E0A225A6205660439F6CE46D252069FF',
+            16
+        );
+        $bobPrivate = $this->getInstance(
+            '6E3EFA13A96025D63E4B0D88A09B3A46DDFE9DD3BC9D1655' .
+            '4898C02B4AC181F0CEB4E818664B12F02C71A07215C400F9' .
+            '88352A4779F3E88836F7C3D3B3C739DE',
+            16
+        );
+
+        $alicePublic = $generator->modPow($alicePrivate, $prime);
+        $bobPublic =  $generator->modPow($bobPrivate, $prime);
+
+        $aliceShared = $bobPublic->modPow($alicePrivate, $prime);
+        $bobShared = $alicePublic->modPow($bobPrivate, $prime);
+
+        $this->assertTrue(
+            $aliceShared->equals($bobShared),
+            'Failed asserting that Alice and Bob share the same BigInteger.'
+        );
+    }
 }
diff --git a/vendor/rmccue/requests/library/Requests/Session.php b/vendor/rmccue/requests/library/Requests/Session.php
index bdcb1dd6b..f519d8dc3 100755
--- a/vendor/rmccue/requests/library/Requests/Session.php
+++ b/vendor/rmccue/requests/library/Requests/Session.php
@@ -81,8 +81,9 @@ public function __construct($url = null, $headers = array(), $data = array(), $o
 	 * @return mixed|null Property value, null if none found
 	 */
 	public function __get($key) {
-		if (isset($this->options[$key]))
+		if (isset($this->options[$key])) {
 			return $this->options[$key];
+		}
 
 		return null;
 	}
@@ -112,7 +113,9 @@ public function __isset($key) {
 	 * @param string $key Property key
 	 */
 	public function __unset($key) {
-		$this->options[$key] = null;
+		if (isset($this->options[$key])) {
+			unset($this->options[$key]);
+		}
 	}
 
 	/**#@+
@@ -236,6 +239,7 @@ protected function merge_request($request, $merge_options = true) {
 			$request['url'] = Requests_IRI::absolutize($this->url, $request['url']);
 			$request['url'] = $request['url']->uri;
 		}
+		
 		$request['headers'] = array_merge($this->headers, $request['headers']);
 
 		if (is_array($request['data']) && is_array($this->data)) {
@@ -248,6 +252,7 @@ protected function merge_request($request, $merge_options = true) {
 			// Disallow forcing the type, as that's a per request setting
 			unset($request['options']['type']);
 		}
+		
 		return $request;
 	}
-}
\ No newline at end of file
+}
diff --git a/vendor/swiftmailer/swiftmailer/.travis.yml b/vendor/swiftmailer/swiftmailer/.travis.yml
index 4b86d3f02..cadee014c 100755
--- a/vendor/swiftmailer/swiftmailer/.travis.yml
+++ b/vendor/swiftmailer/swiftmailer/.travis.yml
@@ -4,7 +4,8 @@ php:
   - 5.3
   - 5.4
   - 5.5
-  - hhvm
+  - 5.6
+  - hhvm-nightly
 
 before_script:
     - cp tests/acceptance.conf.php.default tests/acceptance.conf.php
@@ -15,9 +16,10 @@ before_script:
     - mailcatcher --smtp-port 4456
 
 script:
-    - phpunit
+    - phpunit --verbose
 
 matrix:
   allow_failures:
-    - php: hhvm
+    - php: 5.6
+    - php: hhvm-nightly
   fast_finish: true
diff --git a/vendor/swiftmailer/swiftmailer/CHANGES b/vendor/swiftmailer/swiftmailer/CHANGES
index 649605182..96473e912 100755
--- a/vendor/swiftmailer/swiftmailer/CHANGES
+++ b/vendor/swiftmailer/swiftmailer/CHANGES
@@ -1,11 +1,20 @@
 Changelog
 =========
 
-5.1.1 (2014-XX-XX)
+5.2.1 (2014-XX-XX)
 ------------------
 
  * n/a
 
+5.2.0 (2014-05-08)
+------------------
+
+ * fixed Swift_ByteStream_FileByteStream::read() to match to the specification
+ * fixed from-charset and to-charset arguments in mbstring_convert_encoding() usages
+ * fixed infinite loop in StreamBuffer
+ * fixed NullTransport to return the number of ignored emails instead of 0
+ * Use phpunit and mockery for unit testing (realityking)
+
 5.1.0 (2014-03-18)
 ------------------
 
diff --git a/vendor/swiftmailer/swiftmailer/README.git b/vendor/swiftmailer/swiftmailer/README.git
deleted file mode 100755
index ad9cc2ec3..000000000
--- a/vendor/swiftmailer/swiftmailer/README.git
+++ /dev/null
@@ -1,67 +0,0 @@
-This README applies to anyone who checks out the source from git.
-
-If you're reading this page on github.com, and you don't have git
-installed or know about git, you can download this repository by
-using the "download" button on github.com, right above the file
-list.
-
-PREAMBLE:
----------
-
-The git repository is structured in the expected way where "master" is the
-main branch you should use if you want to have bleeding-edge updates.  Any
-other branch should be ignored since it will likely contain unstable
-and/or experimental developments.
-
-Generally speaking you should feel safe using the "master" branch in
-production code.  Anything likely to break will be committed to another
-branch.  Only bugfixes and clean non-breaking feature additions will be
-performed in master.
-
-All releases (post version 4.0.0) are tagged using the version number of
-that release.  Earlier versions exist in a subversion repository at the
-old sourceforge project page.
-
-
-WHAT IS SWIFT MAILER?
----------------------
-
-Swift Mailer is a component based mailing solution for PHP 5.
-It is released under the MIT license.
-
-Homepage:      http://swiftmailer.org/
-Documentation: http://swiftmailer.org/docs
-Mailing List:  http://groups.google.com/group/swiftmailer
-Bugs:          https://github.com/swiftmailer/swiftmailer/issues
-Repository:    https://github.com/swiftmailer/swiftmailer
-
-Swift Mailer is highly object-oriented by design and lends itself
-to use in complex web application with a great deal of flexibility.
-
-For full details on usage, see the documentation.
-
-
-WHY SO MUCH CLUTTER?
---------------------
-As you can probably see, there are a lot more files in here than you find in
-the pre-packaged versions.  That's because I store notes (UML, RFCs etc) in
-the repository.
-
-The main library files live in /lib and the tests live in /tests.  You can run
-the tests by pointing your web browser at /test-suite, or by running the
-command "php test-suite/run.php".  Some tests will be "skipped" if
-tests/smoke.conf.php and tests/acceptance.conf.php are not edited.  This is
-harmless and normal.
-
-If you want to create a bundled-up package from subversion you can do so if
-you have Ant (http://ant.apache.org/) installed.  Simply run "ant package"
-from this directory and the tar.gz file will be created in the /build
-directory.
-
-Running the command "ant" with no arguments will bundle up the package without
-compressing it into a tar.gz file.
-
-Tests can also be run using "ant test" provided php is on your PATH
-environment variable.
-
-EoM
diff --git a/vendor/swiftmailer/swiftmailer/VERSION b/vendor/swiftmailer/swiftmailer/VERSION
index c1f302ca0..33e8081fd 100755
--- a/vendor/swiftmailer/swiftmailer/VERSION
+++ b/vendor/swiftmailer/swiftmailer/VERSION
@@ -1 +1 @@
-Swift-5.1.1-DEV
+Swift-5.2.1-DEV
diff --git a/vendor/swiftmailer/swiftmailer/build.xml b/vendor/swiftmailer/swiftmailer/build.xml
deleted file mode 100755
index 2260269b5..000000000
--- a/vendor/swiftmailer/swiftmailer/build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- Ant build file for Swift Mailer (Standard Edition) -->
-<project name="Swift Mailer SE" default="bundle">
-
-  <!-- Config settings -->
-  <property name="path" value="." />
-  <property name="builddir" value="${path}/build" />
-  <property name="src.versionfile" value="${path}/VERSION" />
-  <!-- Generate version info from VERSION file -->
-  <loadfile property="bundle.name" srcFile="${src.versionfile}">
-    <filterchain>
-      <striplinebreaks />
-    </filterchain>
-  </loadfile>
-  <!-- Generate version number -->
-  <loadfile property="bundle.version" srcFile="${src.versionfile}">
-    <filterchain>
-      <striplinebreaks />
-      <tokenfilter>
-        <replacestring from="Swift-" to=""/>
-      </tokenfilter>
-    </filterchain>
-  </loadfile>
-  <property name="src.readmefile" value="${path}/README" />
-  <property name="src.changesfile" value="${path}/CHANGES" />
-  <property name="src.libdir" value="${path}/lib" />
-  <property name="src.tests" value="${path}/tests" />
-  <property name="builddir.package" value="${builddir}/${bundle.name}" />
-  <property name="runtests" value="" />
-  <filelist id="src.licenses" dir="${path}">
-    <file name="LICENSE" />
-  </filelist>
-
-
-  <!-- Bundle all files into a central location -->
-  <target name="bundle" depends="prepare, clean, copy-classes">
-    <copy file="${src.versionfile}" todir="${builddir.package}" />
-    <copy file="${src.changesfile}" todir="${builddir.package}" />
-    <copy todir="${builddir.package}">
-      <filelist refid="src.licenses" />
-    </copy>
-    <copy file="${src.readmefile}" todir="${builddir.package}" />
-    <move file="${builddir.package}/tests/acceptance.conf.php.default"
-      tofile="${builddir.package}/tests/acceptance.conf.php" />
-    <move file="${builddir.package}/tests/smoke.conf.php.default"
-      tofile="${builddir.package}/tests/smoke.conf.php" />
-  </target>
-
-  <!-- Copy some *.default files to their required files if needed -->
-  <target name="prepare">
-    <copy file="${src.tests}/acceptance.conf.php.default"
-      tofile="${src.tests}/acceptance.conf.php" />
-      <copy file="${src.tests}/smoke.conf.php.default"
-        tofile="${src.tests}/smoke.conf.php" />
-  </target>
-
-  <!-- Clean out the build directory -->
-  <target name="clean">
-    <delete includeemptydirs="true">
-      <fileset dir="${builddir}" includes="**/*" />
-    </delete>
-  </target>
-
-  <!-- Copy all classes from the class path to the bundle -->
-  <target name="copy-classes">
-    <copy todir="${builddir.package}/lib">
-      <fileset dir="${src.libdir}" />
-      <filterchain>
-        <replacetokens>
-          <token key="SWIFT_VERSION_NUMBER" value="${bundle.version}"/>
-        </replacetokens>
-      </filterchain>
-    </copy>
-    <copy todir="${builddir.package}/tests">
-      <fileset dir="${src.tests}" />
-    </copy>
-  </target>
-
-  <!-- Package up the project as a gzip file -->
-  <target name="package" depends="bundle">
-    <tar destfile="${builddir.package}.tar.gz" compression="gzip" longfile="gnu">
-      <fileset dir="${builddir}" />
-    </tar>
-    <delete includeemptydirs="true">
-      <fileset dir="${builddir.package}" includes="**" />
-    </delete>
-  </target>
-
-  <!-- Run the included unit tests -->
-  <target name="test" depends="prepare, clean, copy-classes">
-    <exec executable="phpunit" failonerror="true" />
-  </target>
-
-</project>
diff --git a/vendor/swiftmailer/swiftmailer/composer.json b/vendor/swiftmailer/swiftmailer/composer.json
index f8aed53a6..b76b7a84d 100755
--- a/vendor/swiftmailer/swiftmailer/composer.json
+++ b/vendor/swiftmailer/swiftmailer/composer.json
@@ -18,14 +18,14 @@
         "php": ">=5.2.4"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9@dev"
+        "mockery/mockery": "~0.9.1"
     },
     "autoload": {
         "files": ["lib/swift_required.php"]
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1-dev"
+            "dev-master": "5.2-dev"
         }
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/create_pear_package.php b/vendor/swiftmailer/swiftmailer/create_pear_package.php
deleted file mode 100755
index 521d65011..000000000
--- a/vendor/swiftmailer/swiftmailer/create_pear_package.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-if (!isset($argv[1]))
-{
-  die('You must provide the version (1.0.0)');
-}
-
-if (!isset($argv[2]))
-{
-  die('You must provide the stability (alpha, beta, or stable)');
-}
-
-$context = array(
-  'date'          => date('Y-m-d'),
-  'time'          => date('H:m:00'),
-  'version'       => $argv[1],
-  'api_version'   => $argv[1],
-  'stability'     => $argv[2],
-  'api_stability' => $argv[2],
-);
-
-$context['files'] = '';
-$path = realpath(dirname(__FILE__).'/lib/classes/Swift');
-foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::LEAVES_ONLY) as $file)
-{
-  if (preg_match('/\.php$/', $file))
-  {
-    $name = str_replace($path.'/', '', $file);
-    $context['files'] .= '        <file install-as="Swift/'.$name.'" name="'.$name.'" role="php" />'."\n";
-  }
-}
-
-$template = file_get_contents(dirname(__FILE__).'/package.xml.tpl');
-$content = preg_replace_callback('/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/', 'replace_parameters', $template);
-file_put_contents(dirname(__FILE__).'/package.xml', $content);
-
-function replace_parameters($matches)
-{
-  global $context;
-
-  return isset($context[$matches[1]]) ? $context[$matches[1]] : null;
-}
diff --git a/vendor/swiftmailer/swiftmailer/doc/installing.rst b/vendor/swiftmailer/swiftmailer/doc/installing.rst
index 12a50de41..24aeaec24 100755
--- a/vendor/swiftmailer/swiftmailer/doc/installing.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/installing.rst
@@ -14,18 +14,6 @@ Swiftmailer like this:
 
     $ php composer.phar require swiftmailer/swiftmailer @stable
 
-Installing from PEAR
---------------------
-
-If you want to install Swift Mailer globally on your machine, the easiest
-installation method is using the PEAR channel.
-
-To install the Swift Mailer PEAR package:
-
-* Run the command ``pear channel-discover pear.swiftmailer.org``.
-
-* Then, run the command ``pear install swift/swift``.
-
 Installing from a Package
 -------------------------
 
@@ -135,6 +123,23 @@ OS X.
     CHANGES LICENSE ...
     $
 
+Installing from PEAR
+--------------------
+
+.. note::
+
+    Using PEAR for installing Swiftmailer is deprecated and Swiftmailer 5.1.0
+    was the last version published on the PEAR channel; use Composer instead.
+
+If you want to install Swift Mailer globally on your machine, the easiest
+installation method is using the PEAR channel.
+
+To install the Swift Mailer PEAR package:
+
+* Run the command ``pear channel-discover pear.swiftmailer.org``.
+
+* Then, run the command ``pear install swift/swift``.
+
 Uploading to your Host
 ----------------------
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index 821fab8e4..e12c0dd5d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -77,7 +77,7 @@ public function removeFilter($key)
      *
      * @param string $bytes
      *
-     * @return integer
+     * @return int
      *
      * @throws Swift_IoException
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index 5c162483d..aa2959736 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -27,14 +27,14 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     /**
      * The size of the stack
      *
-     * @var integer
+     * @var int
      */
     private $_arraySize = 0;
 
     /**
      * The internal pointer offset.
      *
-     * @var integer
+     * @var int
      */
     private $_offset = 0;
 
@@ -72,7 +72,7 @@ public function __construct($stack = null)
      * remaining bytes are given instead. If no bytes are remaining at all, boolean
      * false is returned.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return string
      */
@@ -154,9 +154,9 @@ public function unbind(Swift_InputByteStream $is)
     /**
      * Move the internal read pointer to $byteOffset in the stream.
      *
-     * @param integer $byteOffset
+     * @param int     $byteOffset
      *
-     * @return boolean
+     * @return bool
      */
     public function setReadPointer($byteOffset)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 683f1e8ec..6f1d87e0f 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -42,7 +42,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      * Create a new FileByteStream for $path.
      *
      * @param string  $path
-     * @param boolean $writable if true
+     * @param bool    $writable if true
      */
     public function __construct($path, $writable = false)
     {
@@ -75,9 +75,9 @@ public function getPath()
      * remaining bytes are given instead. If no bytes are remaining at all, boolean
      * false is returned.
      *
-     * @param integer $length
+     * @param int     $length
      *
-     * @return string|boolean
+     * @return string|bool
      *
      * @throws Swift_IoException
      */
@@ -113,9 +113,9 @@ public function read($length)
     /**
      * Move the internal read pointer to $byteOffset in the stream.
      *
-     * @param integer $byteOffset
+     * @param int     $byteOffset
      *
-     * @return boolean
+     * @return bool
      */
     public function setReadPointer($byteOffset)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
index df64d8a31..91a9c9680 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
@@ -26,18 +26,18 @@ interface Swift_CharacterReader
      * Returns the complete character map
      *
      * @param string  $string
-     * @param integer $startOffset
+     * @param int     $startOffset
      * @param array   $currentMap
      * @param mixed   $ignoredChars
      *
-     * @return integer
+     * @return int
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
 
     /**
      * Returns the mapType, see constants.
      *
-     * @return integer
+     * @return int
      */
     public function getMapType();
 
@@ -51,9 +51,9 @@ public function getMapType();
      * A value of -1 means this cannot possibly be a valid character.
      *
      * @param integer[] $bytes
-     * @param integer   $size
+     * @param int       $size
      *
-     * @return integer
+     * @return int
      */
     public function validateByteSequence($bytes, $size);
 
@@ -63,7 +63,7 @@ public function validateByteSequence($bytes, $size);
      * For fixed width character sets this should be the number of octets-per-character.
      * For multibyte character sets this will probably be 1.
      *
-     * @return integer
+     * @return int
      */
     public function getInitialByteSize();
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
index 49d7398c3..654761205 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -21,14 +21,14 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
     /**
      * The number of bytes in a single character.
      *
-     * @var integer
+     * @var int
      */
     private $_width;
 
     /**
      * Creates a new GenericFixedWidthReader using $width bytes per character.
      *
-     * @param integer $width
+     * @param int     $width
      */
     public function __construct($width)
     {
@@ -39,11 +39,11 @@ public function __construct($width)
      * Returns the complete character map.
      *
      * @param string  $string
-     * @param integer $startOffset
+     * @param int     $startOffset
      * @param array   $currentMap
      * @param mixed   $ignoredChars
      *
-     * @return integer
+     * @return int
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
@@ -59,7 +59,7 @@ public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredC
     /**
      * Returns the mapType.
      *
-     * @return integer
+     * @return int
      */
     public function getMapType()
     {
@@ -76,9 +76,9 @@ public function getMapType()
      * A value of -1 means this cannot possibly be a valid character.
      *
      * @param string  $bytes
-     * @param integer $size
+     * @param int     $size
      *
-     * @return integer
+     * @return int
      */
     public function validateByteSequence($bytes, $size)
     {
@@ -90,7 +90,7 @@ public function validateByteSequence($bytes, $size)
     /**
      * Returns the number of bytes which should be read to start each character.
      *
-     * @return integer
+     * @return int
      */
     public function getInitialByteSize()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
index 18f3b04cb..8d03f316d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -21,11 +21,11 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
      * Returns the complete character map.
      *
      * @param string  $string
-     * @param integer $startOffset
+     * @param int     $startOffset
      * @param array   $currentMap
      * @param string  $ignoredChars
      *
-     * @return integer
+     * @return int
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
@@ -43,7 +43,7 @@ public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredC
     /**
      * Returns mapType
      *
-     * @return integer mapType
+     * @return int     mapType
      */
     public function getMapType()
     {
@@ -59,9 +59,9 @@ public function getMapType()
      * A value of -1 means this cannot possibly be a valid character.
      *
      * @param string  $bytes
-     * @param integer $size
+     * @param int     $size
      *
-     * @return integer
+     * @return int
      */
     public function validateByteSequence($bytes, $size)
     {
@@ -76,7 +76,7 @@ public function validateByteSequence($bytes, $size)
     /**
      * Returns the number of bytes which should be read to start each character.
      *
-     * @return integer
+     * @return int
      */
     public function getInitialByteSize()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index e3773c31f..900bad557 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -78,11 +78,11 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
      * Returns the complete character map.
      *
      * @param string  $string
-     * @param integer $startOffset
+     * @param int     $startOffset
      * @param array   $currentMap
      * @param mixed   $ignoredChars
      *
-     * @return integer
+     * @return int
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
@@ -136,7 +136,7 @@ public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredC
     /**
      * Returns mapType.
      *
-     * @return integer mapType
+     * @return int     mapType
      */
     public function getMapType()
     {
@@ -152,9 +152,9 @@ public function getMapType()
      * A value of -1 means this cannot possibly be a valid character.
      *
      * @param string  $bytes
-     * @param integer $size
+     * @param int     $size
      *
-     * @return integer
+     * @return int
      */
     public function validateByteSequence($bytes, $size)
     {
@@ -172,7 +172,7 @@ public function validateByteSequence($bytes, $size)
     /**
      * Returns the number of bytes which should be read to start each character.
      *
-     * @return integer
+     * @return int
      */
     public function getInitialByteSize()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
index 294620017..a0f0721c2 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -54,7 +54,7 @@ public function importString($string);
      * Read $length characters from the stream and move the internal pointer
      * $length further into the stream.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return string
      */
@@ -64,7 +64,7 @@ public function read($length);
      * Read $length characters from the stream and return a 1-dimensional array
      * containing there octet values.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return int[]
      */
@@ -80,7 +80,7 @@ public function write($chars);
     /**
      * Move the internal pointer to $charOffset in the stream.
      *
-     * @param integer $charOffset
+     * @param int     $charOffset
      */
     public function setPointer($charOffset);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index e9064879b..17f32c0cf 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -124,7 +124,7 @@ public function importString($string)
      * Read $length characters from the stream and move the internal pointer
      * $length further into the stream.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return string
      */
@@ -156,7 +156,7 @@ public function read($length)
      * Read $length characters from the stream and return a 1-dimensional array
      * containing there octet values.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return integer[]
      */
@@ -247,7 +247,7 @@ public function write($chars)
     /**
      * Move the internal pointer to $charOffset in the stream.
      *
-     * @param integer $charOffset
+     * @param int     $charOffset
      */
     public function setPointer($charOffset)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 98aabab71..d43c4e0ca 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -49,7 +49,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     /**
      * Number of bytes in the stream
      *
-     * @var integer
+     * @var int
      */
     private $_datasSize = 0;
 
@@ -63,21 +63,21 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     /**
      * Map Type.
      *
-     * @var integer
+     * @var int
      */
     private $_mapType = 0;
 
     /**
      * Number of characters in the stream.
      *
-     * @var integer
+     * @var int
      */
     private $_charCount = 0;
 
     /**
      * Position in the stream.
      *
-     * @var integer
+     * @var int
      */
     private $_currentPos = 0;
 
@@ -157,7 +157,7 @@ public function importString($string)
     /**
      * @see Swift_CharacterStream::read()
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return string
      */
@@ -223,7 +223,7 @@ public function read($length)
     /**
      * @see Swift_CharacterStream::readBytes()
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return integer[]
      */
@@ -242,7 +242,7 @@ public function readBytes($length)
     /**
      * @see Swift_CharacterStream::setPointer()
      *
-     * @param integer $charOffset
+     * @param int     $charOffset
      */
     public function setPointer($charOffset)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
index 58d527527..11179f8da 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
@@ -25,7 +25,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
     /**
      * Sets the maximum number of messages to send per flush.
      *
-     * @param integer $limit
+     * @param int     $limit
      */
     public function setMessageLimit($limit)
     {
@@ -35,7 +35,7 @@ public function setMessageLimit($limit)
     /**
      * Gets the maximum number of messages to send per flush.
      *
-     * @return integer The limit
+     * @return int     The limit
      */
     public function getMessageLimit()
     {
@@ -45,7 +45,7 @@ public function getMessageLimit()
     /**
      * Sets the time limit (in seconds) per flush.
      *
-     * @param integer $limit The limit
+     * @param int     $limit The limit
      */
     public function setTimeLimit($limit)
     {
@@ -55,7 +55,7 @@ public function setTimeLimit($limit)
     /**
      * Gets the time limit (in seconds) per flush.
      *
-     * @return integer The limit
+     * @return int     The limit
      */
     public function getTimeLimit()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
index b7178615f..2f9a77432 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -75,7 +75,7 @@ public function listItems()
      *
      * @param string $itemName
      *
-     * @return boolean
+     * @return bool
      */
     public function has($itemName)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php
index 53e88b8cd..2ad62e6cb 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php
@@ -20,8 +20,8 @@ interface Swift_Encoder extends Swift_Mime_CharsetObserver
      * Encode a given string to produce an encoded string.
      *
      * @param string  $string
-     * @param integer $firstLineOffset if first line needs to be shorter
-     * @param integer $maxLineLength   - 0 indicates the default length for this encoding
+     * @param int     $firstLineOffset if first line needs to be shorter
+     * @param int     $maxLineLength   - 0 indicates the default length for this encoding
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 7c0ce78ed..63e473136 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -25,8 +25,8 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
      * $firstLineOffset.
      *
      * @param string  $string          to encode
-     * @param integer $firstLineOffset
-     * @param integer $maxLineLength   optional, 0 indicates the default of 76 bytes
+     * @param int     $firstLineOffset
+     * @param int     $maxLineLength   optional, 0 indicates the default of 76 bytes
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index e155bb99e..3c362ed57 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -157,8 +157,8 @@ protected function initSafeMap()
      * $firstLineOffset.
      *
      * @param string  $string to encode
-     * @param integer $firstLineOffset, optional
-     * @param integer $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param int     $firstLineOffset, optional
+     * @param int     $maxLineLength,   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -230,7 +230,7 @@ public function charsetChanged($charset)
      * Encode the given byte array into a verbatim QP form.
      *
      * @param integer[] $bytes
-     * @param integer   $size
+     * @param int       $size
      *
      * @return string
      */
@@ -254,7 +254,7 @@ protected function _encodeByteSequence(array $bytes, &$size)
     /**
      * Get the next sequence of bytes to read from the char stream.
      *
-     * @param integer $size number of bytes to read
+     * @param int     $size number of bytes to read
      *
      * @return integer[]
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index 37e30c1d2..aa914a89d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -39,8 +39,8 @@ public function __construct(Swift_CharacterStream $charStream)
      * RFC 2231 from it.
      *
      * @param string  $string
-     * @param integer $firstLineOffset
-     * @param integer $maxLineLength   optional, 0 indicates the default of 75 bytes
+     * @param int     $firstLineOffset
+     * @param int     $maxLineLength   optional, 0 indicates the default of 75 bytes
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php
index d4e5bf57f..c93bd9936 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php
@@ -27,14 +27,14 @@ public function getSource();
     /**
      * Prevent this Event from bubbling any further up the stack.
      *
-     * @param boolean $cancel, optional
+     * @param bool    $cancel, optional
      */
     public function cancelBubble($cancel = true);
 
     /**
      * Returns true if this Event will not bubble any further up the stack.
      *
-     * @return boolean
+     * @return bool
      */
     public function bubbleCancelled();
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index 65c5ec2ab..59aeac855 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -43,7 +43,7 @@ public function createCommandEvent(Swift_Transport $source, $command, $successCo
      *
      * @param Swift_Transport $source
      * @param string          $response
-     * @param boolean         $valid    If the response is valid
+     * @param bool            $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 7a2b31cba..30526ce2d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -46,7 +46,7 @@ public function getSource()
     /**
      * Prevent this Event from bubbling any further up the stack.
      *
-     * @param boolean $cancel, optional
+     * @param bool    $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
@@ -56,7 +56,7 @@ public function cancelBubble($cancel = true)
     /**
      * Returns true if this Event will not bubble any further up the stack.
      *
-     * @return boolean
+     * @return bool
      */
     public function bubbleCancelled()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 6b9117cbc..6d7eb2710 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -20,7 +20,7 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
     /**
      * The overall result.
      *
-     * @var boolean
+     * @var bool
      */
     private $_valid;
 
@@ -36,7 +36,7 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      *
      * @param Swift_Transport $source
      * @param string          $response
-     * @param boolean         $valid
+     * @param bool            $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
@@ -58,7 +58,7 @@ public function getResponse()
     /**
      * Get the success status of this Event.
      *
-     * @return boolean
+     * @return bool
      */
     public function isValid()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 79eea1727..0e055405d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -46,7 +46,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
     /**
      * The overall result as a bitmask from the class constants.
      *
-     * @var integer
+     * @var int
      */
     private $_result;
 
@@ -106,7 +106,7 @@ public function getFailedRecipients()
     /**
      * Set the result of sending.
      *
-     * @param integer $result
+     * @param int     $result
      */
     public function setResult($result)
     {
@@ -119,7 +119,7 @@ public function setResult($result)
      * The return value is a bitmask from
      * {@see RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
      *
-     * @return integer
+     * @return int
      */
     public function getResult()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index eb77de263..b869481ef 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -72,7 +72,7 @@ public function createCommandEvent(Swift_Transport $source, $command, $successCo
      *
      * @param Swift_Transport $source
      * @param string          $response
-     * @param boolean         $valid    If the response is valid
+     * @param bool            $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
index 0f01f40b8..c2f8d7cff 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -48,7 +48,7 @@ public function __construct($path)
     /**
      * Tests if this Spool mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
@@ -74,7 +74,7 @@ public function stop()
      *
      * Default, is ten and allows over 64^20 different fileNames
      *
-     * @param integer $limit
+     * @param int     $limit
      */
     public function setRetryLimit($limit)
     {
@@ -86,7 +86,7 @@ public function setRetryLimit($limit)
      *
      * @param Swift_Mime_Message $message The message to store
      *
-     * @return boolean
+     * @return bool
      *
      * @throws Swift_IoException
      */
@@ -115,7 +115,7 @@ public function queueMessage(Swift_Mime_Message $message)
     /**
      * Execute a recovery if for any reason a process is sending for too long.
      *
-     * @param integer $timeout in second Defaults is for very slow smtp responses
+     * @param int     $timeout in second Defaults is for very slow smtp responses
      */
     public function recover($timeout = 900)
     {
@@ -137,7 +137,7 @@ public function recover($timeout = 900)
      * @param Swift_Transport $transport        A transport instance
      * @param string[]        $failedRecipients An array of failures by-reference
      *
-     * @return integer The number of sent e-mail's
+     * @return int     The number of sent e-mail's
      */
     public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
     {
@@ -190,7 +190,7 @@ public function flushQueue(Swift_Transport $transport, &$failedRecipients = null
     /**
      * Returns a random string needed to generate a fileName for the queue.
      *
-     * @param integer $count
+     * @param int     $count
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
index ae81e5d96..3506aca2e 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -32,7 +32,7 @@ interface Swift_InputByteStream
      *
      * @param string $bytes
      *
-     * @return integer
+     * @return int
      *
      * @throws Swift_IoException
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
index f66b0ebfe..606f55ee7 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -31,7 +31,7 @@ interface Swift_KeyCache
      * @param string  $nsKey
      * @param string  $itemKey
      * @param string  $string
-     * @param integer $mode
+     * @param int     $mode
      */
     public function setString($nsKey, $itemKey, $string, $mode);
 
@@ -43,7 +43,7 @@ public function setString($nsKey, $itemKey, $string, $mode);
      * @param string                 $nsKey
      * @param string                 $itemKey
      * @param Swift_OutputByteStream $os
-     * @param integer                $mode
+     * @param int                    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
@@ -86,7 +86,7 @@ public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
      * @param string $nsKey
      * @param string $itemKey
      *
-     * @return boolean
+     * @return bool
      */
     public function hasKey($nsKey, $itemKey);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index aa98489b4..8ef3dcc99 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -50,7 +50,7 @@ public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
      * @param string  $nsKey
      * @param string  $itemKey
      * @param string  $string
-     * @param integer $mode
+     * @param int     $mode
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
@@ -81,7 +81,7 @@ public function setString($nsKey, $itemKey, $string, $mode)
      * @param string                 $nsKey
      * @param string                 $itemKey
      * @param Swift_OutputByteStream $os
-     * @param integer                $mode
+     * @param int                    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -164,7 +164,7 @@ public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
      * @param string $nsKey
      * @param string $itemKey
      *
-     * @return boolean
+     * @return bool
      */
     public function hasKey($nsKey, $itemKey)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index 740897a53..abd8611f2 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -50,7 +50,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
     /**
      * Will be true if magic_quotes_runtime is turned on.
      *
-     * @var boolean
+     * @var bool
      */
     private $_quotes = false;
 
@@ -79,7 +79,7 @@ public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
      * @param string  $nsKey
      * @param string  $itemKey
      * @param string  $string
-     * @param integer $mode
+     * @param int     $mode
      *
      * @throws Swift_IoException
      */
@@ -112,7 +112,7 @@ public function setString($nsKey, $itemKey, $string, $mode)
      * @param string                 $nsKey
      * @param string                 $itemKey
      * @param Swift_OutputByteStream $os
-     * @param integer                $mode
+     * @param int                    $mode
      *
      * @throws Swift_IoException
      */
@@ -224,7 +224,7 @@ public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
      * @param string $nsKey
      * @param string $itemKey
      *
-     * @return boolean
+     * @return bool
      */
     public function hasKey($nsKey, $itemKey)
     {
@@ -286,7 +286,7 @@ private function _prepareCache($nsKey)
      *
      * @param string  $nsKey
      * @param string  $itemKey
-     * @param integer $position
+     * @param int     $position
      *
      * @return resource
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index a859da0f1..5c4e2cfd6 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -25,7 +25,7 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      * @param string  $nsKey
      * @param string  $itemKey
      * @param string  $string
-     * @param integer $mode
+     * @param int     $mode
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
@@ -39,7 +39,7 @@ public function setString($nsKey, $itemKey, $string, $mode)
      * @param string                 $nsKey
      * @param string                 $itemKey
      * @param Swift_OutputByteStream $os
-     * @param integer                $mode
+     * @param int                    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -89,7 +89,7 @@ public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
      * @param string $nsKey
      * @param string $itemKey
      *
-     * @return boolean
+     * @return bool
      */
     public function hasKey($nsKey, $itemKey)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
index b6703deea..f4e051232 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
@@ -70,7 +70,7 @@ public function createMessage($service = 'message')
      * @param Swift_Mime_Message $message
      * @param array              $failedRecipients An array of failures by-reference
      *
-     * @return integer
+     * @return int
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index 37e98daf3..1dd32415b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -37,7 +37,7 @@ public function __construct(array $recipients)
     /**
      * Returns true only if there are more recipients to send to.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasNext()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
index 073bce154..8f109fa95 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
@@ -20,7 +20,7 @@ interface Swift_Mailer_RecipientIterator
     /**
      * Returns true only if there are more recipients to send to.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasNext();
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
index 764b5aa20..6e042cd6a 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -21,7 +21,7 @@ class Swift_MemorySpool implements Swift_Spool
     /**
      * Tests if this Transport mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
@@ -47,7 +47,7 @@ public function stop()
      *
      * @param Swift_Mime_Message $message The message to store
      *
-     * @return boolean Whether the operation has succeeded
+     * @return bool    Whether the operation has succeeded
      */
     public function queueMessage(Swift_Mime_Message $message)
     {
@@ -62,7 +62,7 @@ public function queueMessage(Swift_Mime_Message $message)
      * @param Swift_Transport $transport        A transport instance
      * @param string[]        $failedRecipients An array of failures by-reference
      *
-     * @return integer The number of sent emails
+     * @return int     The number of sent emails
      */
     public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index faf358fa5..108a02adf 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -42,7 +42,7 @@ public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEnc
      *
      * Always returns {@link LEVEL_MIXED}.
      *
-     * @return integer
+     * @return int
      */
     public function getNestingLevel()
     {
@@ -107,7 +107,7 @@ public function setFilename($filename)
     /**
      * Get the file size of this attachment.
      *
-     * @return integer
+     * @return int
      */
     public function getSize()
     {
@@ -117,7 +117,7 @@ public function getSize()
     /**
      * Set the file size of this attachment.
      *
-     * @param integer $size
+     * @param int     $size
      *
      * @return Swift_Mime_Attachment
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
index 49b0b5b4b..67fbf94df 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
@@ -22,8 +22,8 @@ interface Swift_Mime_ContentEncoder extends Swift_Encoder
      *
      * @param Swift_OutputByteStream $os              to read from
      * @param Swift_InputByteStream  $is              to write to
-     * @param integer                $firstLineOffset
-     * @param integer                $maxLineLength   - 0 indicates the default length for this encoding
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength   - 0 indicates the default length for this encoding
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 71b12afd3..ed9baf469 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -22,8 +22,8 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
      *
      * @param Swift_OutputByteStream $os
      * @param Swift_InputByteStream  $is
-     * @param integer                $firstLineOffset
-     * @param integer                $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index f7dac2163..ce7c31ea8 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -45,8 +45,8 @@ public function charsetChanged($charset)
      *
      * @param Swift_OutputByteStream $os              to read from
      * @param Swift_InputByteStream  $is              to write to
-     * @param integer                $firstLineOffset
-     * @param integer                $maxLineLength   0 indicates the default length for this encoding
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength   0 indicates the default length for this encoding
      *
      * @throws RuntimeException
      */
@@ -80,8 +80,8 @@ public function getName()
      * Encode a given string to produce an encoded string.
      *
      * @param string  $string
-     * @param integer $firstLineOffset if first line needs to be shorter
-     * @param integer $maxLineLength   0 indicates the default length for this encoding
+     * @param int     $firstLineOffset if first line needs to be shorter
+     * @param int     $maxLineLength   0 indicates the default length for this encoding
      *
      * @return string
      *
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index a1df77b35..c48e6bb82 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -27,7 +27,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     /**
      * True if canonical transformations should be done.
      *
-     * @var boolean
+     * @var bool
      */
     private $_canonical;
 
@@ -35,7 +35,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
      *
      * @param string  $name
-     * @param boolean $canonical If canonicalization transformation should be done.
+     * @param bool    $canonical If canonicalization transformation should be done.
      */
     public function __construct($name, $canonical = false)
     {
@@ -47,8 +47,8 @@ public function __construct($name, $canonical = false)
      * Encode a given string to produce an encoded string.
      *
      * @param string  $string
-     * @param integer $firstLineOffset ignored
-     * @param integer $maxLineLength   - 0 means no wrapping will occur
+     * @param int     $firstLineOffset ignored
+     * @param int     $maxLineLength   - 0 means no wrapping will occur
      *
      * @return string
      */
@@ -66,8 +66,8 @@ public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
      *
      * @param Swift_OutputByteStream $os
      * @param Swift_InputByteStream  $is
-     * @param integer                $firstLineOffset ignored
-     * @param integer                $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int                    $firstLineOffset ignored
+     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -112,7 +112,7 @@ public function charsetChanged($charset)
      * A safer (but weaker) wordwrap for unicode.
      *
      * @param string  $string
-     * @param integer $length
+     * @param int     $length
      * @param string  $le
      *
      * @return string
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index e3ee2026e..6df4a5f3f 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -24,7 +24,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
      *
      * @param Swift_CharacterStream $charStream to use for reading characters
      * @param Swift_StreamFilter    $filter     if canonicalization should occur
-     * @param boolean               $dotEscape  if dot stuffing workaround must be enabled
+     * @param bool                  $dotEscape  if dot stuffing workaround must be enabled
      */
     public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
     {
@@ -60,8 +60,8 @@ protected function initSafeMap()
      *
      * @param Swift_OutputByteStream $os              output stream
      * @param Swift_InputByteStream  $is              input stream
-     * @param integer                $firstLineOffset
-     * @param integer                $maxLineLength
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 05e06e21b..9079fabf5 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -38,7 +38,7 @@ public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEnc
      *
      * Returns {@see LEVEL_RELATED}.
      *
-     * @return integer
+     * @return int
      */
     public function getNestingLevel()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
index 55d3ab8ae..8a3d05f83 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -41,7 +41,7 @@ interface Swift_Mime_Header
      * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
      * @see TYPE_DATE, TYPE_ID, TYPE_PATH
      *
-     * @return integer
+     * @return int
      */
     public function getFieldType();
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 7c5e191ba..7a57e3f74 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -35,8 +35,8 @@ public function getName()
      * default encodeString, otherwise pass to the parent method.
      *
      * @param string  $string          string to encode
-     * @param integer $firstLineOffset
-     * @param integer $maxLineLength   optional, 0 indicates the default of 76 bytes
+     * @param int     $firstLineOffset
+     * @param int     $maxLineLength   optional, 0 indicates the default of 76 bytes
      * @param string  $charset
      *
      * @return string
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index c9bbe7106..1527f4ff9 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -53,8 +53,8 @@ public function getName()
      * Takes an unencoded string and produces a QP encoded string from it.
      *
      * @param string  $string          string to encode
-     * @param integer $firstLineOffset optional
-     * @param integer $maxLineLength   optional, 0 indicates the default of 76 chars
+     * @param int     $firstLineOffset optional
+     * @param int     $maxLineLength   optional, 0 indicates the default of 76 chars
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
index 7cab133ca..40a1e1739 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
@@ -31,7 +31,7 @@ public function createMailboxHeader($name, $addresses = null);
      * Create a new Date header using $timestamp (UNIX time).
      *
      * @param string  $name
-     * @param integer $timestamp
+     * @param int     $timestamp
      *
      * @return Swift_Mime_Header
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
index 6ff0033ca..309bcd861 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
@@ -29,7 +29,7 @@ public function addMailboxHeader($name, $addresses = null);
      * Add a new Date header using $timestamp (UNIX time).
      *
      * @param string  $name
-     * @param integer $timestamp
+     * @param int     $timestamp
      */
     public function addDateHeader($name, $timestamp = null);
 
@@ -72,9 +72,9 @@ public function addPathHeader($name, $path = null);
      * If multiple headers match, the actual one may be specified by $index.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      *
-     * @return boolean
+     * @return bool
      */
     public function has($name, $index = 0);
 
@@ -88,7 +88,7 @@ public function has($name, $index = 0);
      * offset.
      *
      * @param Swift_Mime_Header $header
-     * @param integer           $index
+     * @param int               $index
      */
     public function set(Swift_Mime_Header $header, $index = 0);
 
@@ -98,7 +98,7 @@ public function set(Swift_Mime_Header $header, $index = 0);
      * Returns NULL if none present.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      *
      * @return Swift_Mime_Header
      */
@@ -126,7 +126,7 @@ public function listAll();
      * If multiple headers match, the actual one may be specified by $index.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      */
     public function remove($name, $index = 0);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index 9e7fee7a9..cdf79036a 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -179,7 +179,7 @@ public function getFieldName()
     /**
      * Set the maximum length of lines in the header (excluding EOL).
      *
-     * @param integer $lineLength
+     * @param int     $lineLength
      */
     public function setMaxLineLength($lineLength)
     {
@@ -240,7 +240,7 @@ protected function setFieldName($name)
      * @param string                   $string  as displayed
      * @param string                   $charset of the text
      * @param Swift_Mime_HeaderEncoder $encoder
-     * @param boolean                  $shorten the first line to make remove for header name
+     * @param bool                     $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -317,7 +317,7 @@ protected function encodeWords(Swift_Mime_Header $header, $input, $usedLength =
      *
      * @param string $token
      *
-     * @return boolean
+     * @return bool
      */
     protected function tokenNeedsEncoding($token)
     {
@@ -359,7 +359,7 @@ protected function getEncodableWordTokens($string)
      * Get a token as an encoded word for safe insertion into headers.
      *
      * @param string  $token           token to encode
-     * @param integer $firstLineOffset optional
+     * @param int     $firstLineOffset optional
      *
      * @return string
      */
@@ -430,7 +430,7 @@ protected function getCachedValue()
     /**
      * Clear the cached value if $condition is met.
      *
-     * @param boolean $condition
+     * @param bool    $condition
      */
     protected function clearCachedValueIf($condition)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 9127cc22a..015bc4421 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -61,7 +61,7 @@ public function getFieldType()
      *
      * This method takes a UNIX timestamp.
      *
-     * @param integer $model
+     * @param int     $model
      */
     public function setFieldBodyModel($model)
     {
@@ -93,7 +93,7 @@ public function getTimestamp()
     /**
      * Set the UNIX timestamp of the Date in this Header.
      *
-     * @param integer $timestamp
+     * @param int     $timestamp
      */
     public function setTimestamp($timestamp)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index b8d08bd3e..766d6a18d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -272,7 +272,7 @@ protected function normalizeMailboxes(array $mailboxes)
      * Produces a compliant, formatted display-name based on the string given.
      *
      * @param string  $displayName as displayed
-     * @param boolean $shorten     the first line to make remove for header name
+     * @param bool    $shorten     the first line to make remove for header name
      *
      * @return string
      */
@@ -305,7 +305,7 @@ protected function createMailboxListString(array $mailboxes)
      *
      * @param string $token
      *
-     * @return boolean
+     * @return bool
      */
     protected function tokenNeedsEncoding($token)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index 0e4ac7d96..7f52857e1 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -241,8 +241,8 @@ private function _createParameter($name, $value)
      * Returns the parameter value from the "=" and beyond.
      *
      * @param string  $value     to append
-     * @param boolean $encoded
-     * @param boolean $firstLine
+     * @param bool    $encoded
+     * @param bool    $firstLine
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
index bce3af3ce..59df2f2e9 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
@@ -41,7 +41,7 @@ public function getSubject();
     /**
      * Set the origination date of the message as a UNIX timestamp.
      *
-     * @param integer $date
+     * @param int     $date
      */
     public function setDate($date);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index a3c4eeedd..1efcc8cd7 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -126,7 +126,7 @@ public function setFormat($format)
     /**
      * Test if delsp is being used for this entity.
      *
-     * @return boolean
+     * @return bool
      */
     public function getDelSp()
     {
@@ -138,7 +138,7 @@ public function getDelSp()
     /**
      * Turn delsp on or off for this entity.
      *
-     * @param boolean $delsp
+     * @param bool    $delsp
      *
      * @return Swift_Mime_MimePart
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index 968c0e329..b82e33b4d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -67,7 +67,7 @@ public function createMailboxHeader($name, $addresses = null)
     /**
      * Create a new Date header using $timestamp (UNIX time).
      * @param string       $name
-     * @param integer|null $timestamp
+     * @param int|null     $timestamp
      *
      * @return Swift_Mime_Header
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index e06f93603..bd6ed6bcd 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -74,7 +74,7 @@ public function addMailboxHeader($name, $addresses = null)
      * Add a new Date header using $timestamp (UNIX time).
      *
      * @param string  $name
-     * @param integer $timestamp
+     * @param int     $timestamp
      */
     public function addDateHeader($name, $timestamp = null)
     {
@@ -134,9 +134,9 @@ public function addPathHeader($name, $path = null)
      * If multiple headers match, the actual one may be specified by $index.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      *
-     * @return boolean
+     * @return bool
      */
     public function has($name, $index = 0)
     {
@@ -155,7 +155,7 @@ public function has($name, $index = 0)
      * offset.
      *
      * @param Swift_Mime_Header $header
-     * @param integer           $index
+     * @param int               $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
@@ -169,7 +169,7 @@ public function set(Swift_Mime_Header $header, $index = 0)
      * Returns NULL if none present.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      *
      * @return Swift_Mime_Header
      */
@@ -229,7 +229,7 @@ public function listAll()
      * If multiple headers match, the actual one may be specified by $index.
      *
      * @param string  $name
-     * @param integer $index
+     * @param int     $index
      */
     public function remove($name, $index = 0)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index 652f928ca..4b2c88b4d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -93,7 +93,7 @@ public function getSubject()
     /**
      * Set the date at which this message was created.
      *
-     * @param integer $date
+     * @param int     $date
      *
      * @return Swift_Mime_SimpleMessage
      */
@@ -109,7 +109,7 @@ public function setDate($date)
     /**
      * Get the date at which this message was created.
      *
-     * @return integer
+     * @return int
      */
     public function getDate()
     {
@@ -447,7 +447,7 @@ public function getBcc()
      *
      * The value is an integer where 1 is the highest priority and 5 is the lowest.
      *
-     * @param integer $priority
+     * @param int     $priority
      *
      * @return Swift_Mime_SimpleMessage
      */
@@ -482,7 +482,7 @@ public function setPriority($priority)
      * The returned value is an integer where 1 is the highest priority and 5
      * is the lowest.
      *
-     * @return integer
+     * @return int
      */
     public function getPriority()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index 96ac34b1a..e2fc7296d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -141,7 +141,7 @@ public function getHeaders()
      *
      * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
      *
-     * @return integer
+     * @return int
      */
     public function getNestingLevel()
     {
@@ -239,7 +239,7 @@ public function setDescription($description)
     /**
      * Get the maximum line length of the body of this entity.
      *
-     * @return integer
+     * @return int
      */
     public function getMaxLineLength()
     {
@@ -251,7 +251,7 @@ public function getMaxLineLength()
      *
      * Though not enforced by the library, lines should not exceed 1000 chars.
      *
-     * @param integer $length
+     * @param int     $length
      *
      * @return Swift_Mime_SimpleMimeEntity
      */
@@ -276,7 +276,7 @@ public function getChildren()
      * Set all children of this entity.
      *
      * @param array   $children      Swift_Mime_Entity instances
-     * @param integer $compoundLevel For internal use only
+     * @param int     $compoundLevel For internal use only
      *
      * @return Swift_Mime_SimpleMimeEntity
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php
index 2ff74491f..47faa73af 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php
@@ -27,9 +27,9 @@ interface Swift_OutputByteStream
      * If less bytes exist than are requested the remaining bytes are given instead.
      * If no bytes are remaining at all, boolean false is returned.
      *
-     * @param integer $length
+     * @param int     $length
      *
-     * @return string|boolean
+     * @return string|bool
      *
      * @throws Swift_IoException
      */
@@ -38,9 +38,9 @@ public function read($length);
     /**
      * Move the internal read pointer to $byteOffset in the stream.
      *
-     * @param integer $byteOffset
+     * @param int     $byteOffset
      *
-     * @return boolean
+     * @return bool
      *
      * @throws Swift_IoException
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index e01982ad1..307da9d77 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -48,8 +48,8 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
     /**
      * Create a new AntiFloodPlugin with $threshold and $sleep time.
      *
-     * @param integer               $threshold
-     * @param integer               $sleep     time
+     * @param int                   $threshold
+     * @param int                   $sleep     time
      * @param Swift_Plugins_Sleeper $sleeper   (not needed really)
      */
     public function __construct($threshold = 99, $sleep = 0, Swift_Plugins_Sleeper $sleeper = null)
@@ -62,7 +62,7 @@ public function __construct($threshold = 99, $sleep = 0, Swift_Plugins_Sleeper $
     /**
      * Set the number of emails to send before restarting.
      *
-     * @param integer $threshold
+     * @param int     $threshold
      */
     public function setThreshold($threshold)
     {
@@ -82,7 +82,7 @@ public function getThreshold()
     /**
      * Set the number of seconds to sleep for during a restart.
      *
-     * @param integer $sleep time
+     * @param int     $sleep time
      */
     public function setSleepTime($sleep)
     {
@@ -130,7 +130,7 @@ public function sendPerformed(Swift_Events_SendEvent $evt)
     /**
      * Sleep for $seconds.
      *
-     * @param integer $seconds
+     * @param int     $seconds
      */
     public function sleep($seconds)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
index c542169f8..73b95545b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
@@ -23,7 +23,7 @@ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
     /**
      * Create a new EchoLogger.
      *
-     * @param boolean $isHtml
+     * @param bool    $isHtml
      */
     public function __construct($isHtml = true)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 35d5de53f..b5dfa8b13 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -40,7 +40,7 @@ public function getMessages()
     /**
      * Get the message count
      *
-     * @return integer count
+     * @return int     count
      */
     public function countMessages()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index 5535cca9d..379c45141 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -48,7 +48,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
      * @param string  $host
-     * @param integer $port
+     * @param int     $port
      * @param string  $crypto as "tls" or "ssl"
      */
     public function __construct($host, $port = 110, $crypto = null)
@@ -62,7 +62,7 @@ public function __construct($host, $port = 110, $crypto = null)
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
      * @param string  $host
-     * @param integer $port
+     * @param int     $port
      * @param string  $crypto as "tls" or "ssl"
      *
      * @return Swift_Plugins_PopBeforeSmtpPlugin
@@ -99,7 +99,7 @@ public function bindSmtp(Swift_Transport $smtp)
     /**
      * Set the connection timeout in seconds (default 10).
      *
-     * @param integer $timeout
+     * @param int     $timeout
      *
      * @return Swift_Plugins_PopBeforeSmtpPlugin
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
index 0dfa22d8c..504c0c888 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -28,7 +28,7 @@ interface Swift_Plugins_Reporter
      *
      * @param Swift_Mime_Message $message
      * @param string             $address
-     * @param integer            $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_Message $message, $address, $result);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index 844e2a18f..5890eea91 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -31,7 +31,7 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @param Swift_Mime_Message $message
      * @param string             $address
-     * @param integer            $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_Message $message, $address, $result)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index 7b8c18891..cd3b98425 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -22,7 +22,7 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
      *
      * @param Swift_Mime_Message $message
      * @param string             $address
-     * @param integer            $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param int                $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_Message $message, $address, $result)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
index c491f63d6..35a63b4fb 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
@@ -20,7 +20,7 @@ interface Swift_Plugins_Sleeper
     /**
      * Sleep for $seconds.
      *
-     * @param integer $seconds
+     * @param int     $seconds
      */
     public function sleep($seconds);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 1fba10228..933104e08 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -73,8 +73,8 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
     /**
      * Create a new ThrottlerPlugin.
      *
-     * @param integer               $rate
-     * @param integer               $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $rate
+     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
@@ -133,7 +133,7 @@ public function sendPerformed(Swift_Events_SendEvent $evt)
     /**
      * Sleep for $seconds.
      *
-     * @param integer $seconds
+     * @param int     $seconds
      */
     public function sleep($seconds)
     {
@@ -163,7 +163,7 @@ public function getTimestamp()
     /**
      * Get a number of seconds to sleep for.
      *
-     * @param integer $timePassed
+     * @param int     $timePassed
      *
      * @return int
      */
@@ -191,7 +191,7 @@ private function _throttleMessagesPerSecond($timePassed)
     /**
      * Get a number of seconds to sleep for.
      *
-     * @param integer $timePassed
+     * @param int     $timePassed
      *
      * @return int
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
index ded845b74..629436f57 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
@@ -86,7 +86,7 @@ public function setCacheType($type)
     /**
      * Set the QuotedPrintable dot escaper preference.
      *
-     * @param boolean $dotEscape
+     * @param bool    $dotEscape
      *
      * @return Swift_Preferences
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index 6a240c7f3..75fc01b08 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -90,7 +90,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Embbed bodyLen in signature
      *
-     * @var boolean
+     * @var bool
      */
     protected $_showLen = false;
 
@@ -112,7 +112,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Must we embed signed headers?
      *
-     * @var boolean
+     * @var bool
      */
     protected $_debugHeaders = false;
 
@@ -413,7 +413,7 @@ public function setSignatureExpiration($time)
     /**
      * Enable / disable the DebugHeaders
      *
-     * @param boolean $debug
+     * @param bool    $debug
      * @return Swift_Signers_DKIMSigner
      */
     public function setDebugHeaders($debug)
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 037a81664..dbfd292b4 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -69,7 +69,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Must we embed signed headers?
      *
-     * @var boolean
+     * @var bool
      */
     protected $_debugHeaders = false;
 
@@ -299,7 +299,7 @@ public function setSignerIdentity($identity)
     /**
      * Enable / disable the DebugHeaders
      *
-     * @param boolean $debug
+     * @param bool    $debug
      * @return Swift_Signers_DomainKeySigner
      */
     public function setDebugHeaders($debug)
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index 45c89ab91..22b57cb8b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -154,7 +154,7 @@ public function setSignatureExpiration($time)
     /**
      * Enable / disable the DebugHeaders
      *
-     * @param boolean $debug
+     * @param bool    $debug
      * @return Swift_Signers_DKIMSigner
      */
     public function setDebugHeaders($debug)
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index 939faba2f..5b75e9bcb 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -89,7 +89,7 @@ public static function newInstance($certificate = null, $privateKey = null)
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
-     * @param integer      $signOptions Bitwise operator options for openssl_pkcs7_sign()
+     * @param int          $signOptions Bitwise operator options for openssl_pkcs7_sign()
      *
      * @return Swift_Signers_SMimeSigner
      */
@@ -118,7 +118,7 @@ public function setSignCertificate($certificate, $privateKey = null, $signOption
      * @link http://nl3.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
-     * @param integer      $cipher
+     * @param int          $cipher
      *
      * @return Swift_Signers_SMimeSigner
      */
@@ -176,7 +176,7 @@ public function setSignThenEncrypt($signThenEncrypt = true)
     }
 
     /**
-     * @return Boolean
+     * @return bool
      */
     public function isSignThenEncrypt()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index 0ed310057..b369f0451 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -27,7 +27,7 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
      * Create a new SmtpTransport, optionally with $host, $port and $security.
      *
      * @param string  $host
-     * @param integer $port
+     * @param int     $port
      * @param string  $security
      */
     public function __construct($host = 'localhost', $port = 25, $security = null)
@@ -47,7 +47,7 @@ public function __construct($host = 'localhost', $port = 25, $security = null)
      * Create a new SmtpTransport instance.
      *
      * @param string  $host
-     * @param integer $port
+     * @param int     $port
      * @param string  $security
      *
      * @return Swift_SmtpTransport
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
index 981c1781f..670be25bd 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
@@ -29,7 +29,7 @@ public function stop();
     /**
      * Tests if this Spool mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted();
 
@@ -38,7 +38,7 @@ public function isStarted();
      *
      * @param Swift_Mime_Message $message The message to store
      *
-     * @return boolean Whether the operation has succeeded
+     * @return bool    Whether the operation has succeeded
      */
     public function queueMessage(Swift_Mime_Message $message);
 
@@ -48,7 +48,7 @@ public function queueMessage(Swift_Mime_Message $message);
      * @param Swift_Transport $transport        A transport instance
      * @param string[]        $failedRecipients An array of failures by-reference
      *
-     * @return integer The number of sent emails
+     * @return int     The number of sent emails
      */
     public function flushQueue(Swift_Transport $transport, &$failedRecipients = null);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php
index 8b887bf67..b62e75159 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php
@@ -21,7 +21,7 @@ interface Swift_StreamFilter
      *
      * @param mixed $buffer
      *
-     * @return boolean
+     * @return bool
      */
     public function shouldBuffer($buffer);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index 77ba9b711..8cedcbeef 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -100,7 +100,7 @@ public function __construct($search, $replace)
      *
      * @param array $buffer
      *
-     * @return boolean
+     * @return bool
      */
     public function shouldBuffer($buffer)
     {
@@ -113,7 +113,7 @@ public function shouldBuffer($buffer)
      * Perform the actual replacements on $buffer and return the result.
      *
      * @param array   $buffer
-     * @param integer $_minReplaces
+     * @param int     $_minReplaces
      *
      * @return array
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
index ca7454eef..4075d08a8 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -39,7 +39,7 @@ public function __construct($search, $replace)
      *
      * @param string $buffer
      *
-     * @return boolean
+     * @return bool
      */
     public function shouldBuffer($buffer)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
index d20c05010..69eec54f7 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
@@ -20,7 +20,7 @@ interface Swift_Transport
     /**
      * Test if this Transport mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted();
 
@@ -43,7 +43,7 @@ public function stop();
      * @param Swift_Mime_Message $message
      * @param string[]           $failedRecipients An array of failures by-reference
      *
-     * @return integer
+     * @return int
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index e90da64af..d140f4b3e 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -130,7 +130,7 @@ public function start()
     /**
      * Test if an SMTP connection has been established.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 80b471278..5c26e4b8b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -34,7 +34,7 @@ public function getAuthKeyword()
      * @param string                    $username
      * @param string                    $password
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index deca3a5d1..8ff7dee86 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -34,7 +34,7 @@ public function getAuthKeyword()
      * @param string                    $username
      * @param string                    $password
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index fe53057ba..62eacdd7b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -39,7 +39,7 @@ public function getAuthKeyword()
      * @param string $username
      * @param string $password
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index ffa9af3d8..6b5a9db2b 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -34,7 +34,7 @@ public function getAuthKeyword()
      * @param string                    $username
      * @param string                    $password
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index 2668fd2df..de19fc1ba 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -43,7 +43,7 @@ public function getAuthKeyword()
      * @param string                    $email
      * @param string                    $token
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index 40b0908c8..452ab8204 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -145,7 +145,7 @@ public function getAuthMode()
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return boolean
+     * @return bool
      */
     public function getHandledKeyword()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 0c6dc2e4d..c1d4a0470 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -31,7 +31,7 @@ public function getAuthKeyword();
      * @param string                    $username
      * @param string                    $password
      *
-     * @return boolean
+     * @return bool
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index 8b673337c..83fb71b1e 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -20,7 +20,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return boolean
+     * @return bool
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ public function getRcptParams();
      * @param string                    $command          to send
      * @param int[]                     $codes            expected in response
      * @param string[]                  $failedRecipients to collect failures
-     * @param boolean                   $stop             to be set true  by-reference if the command is now sent
+     * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
     public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 744a12706..6ad5b098a 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -86,7 +86,7 @@ public function getHost()
     /**
      * Set the port to connect to.
      *
-     * @param integer $port
+     * @param int     $port
      *
      * @return Swift_Transport_EsmtpTransport
      */
@@ -110,7 +110,7 @@ public function getPort()
     /**
      * Set the connection timeout.
      *
-     * @param integer $timeout seconds
+     * @param int     $timeout seconds
      *
      * @return Swift_Transport_EsmtpTransport
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
index 7559ebfd7..835895118 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -61,7 +61,7 @@ public function setWriteTranslations(array $replacements);
      * The $sequence number comes from any writes and may or may not be used
      * depending upon the implementation.
      *
-     * @param integer $sequence of last write to scan from
+     * @param int     $sequence of last write to scan from
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index af8e66a32..7a82632d9 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -62,7 +62,7 @@ public function getTransports()
     /**
      * Test if this Transport mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
index a9bff690a..9103f7943 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
@@ -28,7 +28,7 @@ interface Swift_Transport_MailInvoker
      * @param string $headers
      * @param string $extraParams
      *
-     * @return boolean
+     * @return bool
      */
     public function mail($to, $subject, $body, $headers = null, $extraParams = null);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index ce136d3c3..fcfd9218d 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -30,7 +30,7 @@ public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
     /**
      * Tests if this Transport mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
@@ -57,7 +57,7 @@ public function stop()
      * @param Swift_Mime_Message $message
      * @param string[]           $failedRecipients An array of failures by-reference
      *
-     * @return integer The number of sent emails
+     * @return int     The number of sent emails
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
@@ -73,7 +73,13 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
             $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
-        return 0;
+        $count = (
+            count((array) $message->getTo())
+            + count((array) $message->getCc())
+            + count((array) $message->getBcc())
+            );
+
+        return $count;
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
index 91157e5e7..0bf6c160a 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
@@ -28,7 +28,7 @@ class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
      * @param string $headers
      * @param string $extraParams
      *
-     * @return boolean
+     * @return bool
      */
     public function mail($to, $subject, $body, $headers = null, $extraParams = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index 0a53b15c6..0fafed72c 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -58,7 +58,7 @@ public function getSpool()
     /**
      * Tests if this Transport mechanism has started.
      *
-     * @return boolean
+     * @return bool
      */
     public function isStarted()
     {
@@ -85,7 +85,7 @@ public function stop()
      * @param Swift_Mime_Message $message
      * @param string[]           $failedRecipients An array of failures by-reference
      *
-     * @return integer The number of sent e-mail's
+     * @return int     The number of sent e-mail's
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 0818d85df..f11e344e6 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -153,7 +153,7 @@ public function setWriteTranslations(array $replacements)
      * The $sequence number comes from any writes and may or may not be used
      * depending upon the implementation.
      *
-     * @param integer $sequence of last write to scan from
+     * @param int     $sequence of last write to scan from
      *
      * @return string
      *
@@ -185,9 +185,9 @@ public function readLine($sequence)
      * If less bytes exist than are requested the remaining bytes are given instead.
      * If no bytes are remaining at all, boolean false is returned.
      *
-     * @param integer $length
+     * @param int     $length
      *
-     * @return string|boolean
+     * @return string|bool
      *
      * @throws Swift_IoException
      */
@@ -233,9 +233,14 @@ protected function _commit($bytes)
             $totalBytesWritten = 0;
 
             while ($totalBytesWritten < $bytesToWrite) {
-                $bytesWriten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
-                $totalBytesWritten += $bytesWriten;
+                $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
+                if (false === $bytesWritten || 0 === $bytesWritten) {
+                    break;
+                }
+
+                $totalBytesWritten += $bytesWritten;
             }
+
             if ($totalBytesWritten > 0) {
                 return ++$this->_sequence;
             }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
index e8697ea6f..b6906c0b6 100755
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
@@ -26,7 +26,7 @@ class Swift_Validate
      *
      * @param string $email
      *
-     * @return boolean
+     * @return bool
      */
     public static function email($email)
     {
@@ -35,7 +35,7 @@ public static function email($email)
                 ->lookup('mime.grammar');
         }
 
-        return preg_match(
+        return (bool) preg_match(
                 '/^' . self::$grammar->getDefinition('addr-spec') . '$/D',
                 $email
             );
diff --git a/vendor/swiftmailer/swiftmailer/package.xml.tpl b/vendor/swiftmailer/swiftmailer/package.xml.tpl
deleted file mode 100755
index 306a4eb6e..000000000
--- a/vendor/swiftmailer/swiftmailer/package.xml.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.8.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
- <name>Swift</name>
- <channel>pear.swiftmailer.org</channel>
- <summary>Free Feature-rich PHP Mailer.</summary>
- <description>
-   Swift Mailer integrates into any web app written in PHP 5, offering a flexible and elegant object-oriented approach to sending emails with a multitude of features.
- </description>
- <lead>
-  <name>Fabien Potencier</name>
-  <user>fabpot</user>
-  <email>fabien.potencier@symfony-project.org</email>
-  <active>yes</active>
- </lead>
- <lead>
-  <name>Chris Corbyn</name>
-  <user>d11wtq</user>
-  <email></email>
-  <active>no</active>
- </lead>
- <date>{{ date }}</date>
- <time>{{ time }}</time>
- <version>
-  <release>{{ version }}</release>
-  <api>{{ api_version }}</api>
- </version>
- <stability>
-  <release>{{ stability }}</release>
-  <api>{{ stability }}</api>
- </stability>
- <license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
- <notes>-</notes>
- <contents>
-   <dir name="/">
-     <file name="CHANGES" role="doc" />
-     <file name="LICENSE" role="doc" />
-     <file name="README" role="doc" />
-     <file name="VERSION" role="doc" />
-     <dir name="lib">
-       <file install-as="mime_types.php" name="mime_types.php" role="php" />
-       <file install-as="preferences.php" name="preferences.php" role="php" />
-       <file install-as="swift_init.php" name="swift_init.php" role="php" />
-       <file install-as="swift_required.php" name="swift_required_pear.php" role="php" />
-       <dir name="dependency_maps">
-         <file install-as="dependency_maps/cache_deps.php" name="cache_deps.php" role="php" />
-         <file install-as="dependency_maps/mime_deps.php" name="mime_deps.php" role="php" />
-         <file install-as="dependency_maps/transport_deps.php" name="transport_deps.php" role="php" />
-         <file install-as="dependency_maps/message_deps.php" name="message_deps.php" role="php" />
-       </dir>
-       <dir name="classes">
-         <file install-as="Swift.php" name="Swift.php" role="php" />
-         <dir name="Swift">
-{{ files }}
-         </dir>
-       </dir>
-     </dir>
-   </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.2.4</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.0</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <phprelease />
-</package>
diff --git a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php
index 8b1f18ae3..90636e9a5 100755
--- a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php
+++ b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php
@@ -152,12 +152,12 @@ public static function fromString($cookie, $url = null)
         );
 
         if (null !== $url) {
-            if ((false === $urlParts = parse_url($url)) || !isset($urlParts['host']) || !isset($urlParts['path'])) {
+            if ((false === $urlParts = parse_url($url)) || !isset($urlParts['host'])) {
                 throw new \InvalidArgumentException(sprintf('The URL "%s" is not valid.', $url));
             }
 
             $values['domain'] = $urlParts['host'];
-            $values['path'] = substr($urlParts['path'], 0, strrpos($urlParts['path'], '/'));
+            $values['path'] = isset($urlParts['path']) ? substr($urlParts['path'], 0, strrpos($urlParts['path'], '/')) : '';
         }
 
         foreach ($parts as $part) {
diff --git a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php
index 606b2e2e9..8e3578a28 100755
--- a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php
+++ b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -75,6 +75,8 @@ public function testFromStringWithCapitalization()
     public function testFromStringWithUrl()
     {
         $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com/'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com?foo'));
         $this->assertEquals('foo=bar; domain=www.example.com; path=/foo', (string) Cookie::FromString('foo=bar', 'http://www.example.com/foo/bar'));
         $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar; path=/', 'http://www.example.com/foo/bar'));
         $this->assertEquals('foo=bar; domain=www.myotherexample.com; path=/', (string) Cookie::FromString('foo=bar; domain=www.myotherexample.com', 'http://www.example.com/'));
diff --git a/vendor/symfony/console/Symfony/Component/Console/Application.php b/vendor/symfony/console/Symfony/Component/Console/Application.php
index 6f6849818..c28cd243d 100755
--- a/vendor/symfony/console/Symfony/Component/Console/Application.php
+++ b/vendor/symfony/console/Symfony/Component/Console/Application.php
@@ -99,7 +99,7 @@ public function setDispatcher(EventDispatcherInterface $dispatcher)
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return int     0 if everything went fine, or an error code
+     * @return int 0 if everything went fine, or an error code
      *
      * @throws \Exception When doRun returns Exception
      *
@@ -159,7 +159,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
      * @param InputInterface  $input  An Input instance
      * @param OutputInterface $output An Output instance
      *
-     * @return int     0 if everything went fine, or an error code
+     * @return int 0 if everything went fine, or an error code
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
@@ -270,7 +270,7 @@ public function getHelp()
     /**
      * Sets whether to catch exceptions or not during commands execution.
      *
-     * @param bool    $boolean Whether to catch exceptions or not during commands execution
+     * @param bool $boolean Whether to catch exceptions or not during commands execution
      *
      * @api
      */
@@ -282,7 +282,7 @@ public function setCatchExceptions($boolean)
     /**
      * Sets whether to automatically exit after a command execution or not.
      *
-     * @param bool    $boolean Whether to automatically exit after a command execution or not
+     * @param bool $boolean Whether to automatically exit after a command execution or not
      *
      * @api
      */
@@ -453,7 +453,7 @@ public function get($name)
      *
      * @param string $name The command name or alias
      *
-     * @return bool    true if the command exists, false otherwise
+     * @return bool true if the command exists, false otherwise
      *
      * @api
      */
@@ -632,8 +632,8 @@ public static function getAbbreviations($names)
     /**
      * Returns a text representation of the Application.
      *
-     * @param string  $namespace An optional namespace name
-     * @param bool    $raw       Whether to return raw command list
+     * @param string $namespace An optional namespace name
+     * @param bool   $raw       Whether to return raw command list
      *
      * @return string A string representing the Application
      *
@@ -651,8 +651,8 @@ public function asText($namespace = null, $raw = false)
     /**
      * Returns an XML representation of the Application.
      *
-     * @param string  $namespace An optional namespace name
-     * @param bool    $asDom     Whether to return a DOM or an XML string
+     * @param string $namespace An optional namespace name
+     * @param bool   $asDom     Whether to return a DOM or an XML string
      *
      * @return string|\DOMDocument An XML string representing the Application
      *
@@ -675,34 +675,27 @@ public function asXml($namespace = null, $asDom = false)
     /**
      * Renders a caught exception.
      *
-     * @param \Exception       $e      An exception instance
+     * @param \Exception      $e      An exception instance
      * @param OutputInterface $output An OutputInterface instance
      */
     public function renderException($e, $output)
     {
-        $strlen = function ($string) {
-            if (!function_exists('mb_strlen')) {
-                return strlen($string);
-            }
-
-            if (false === $encoding = mb_detect_encoding($string)) {
-                return strlen($string);
-            }
-
-            return mb_strlen($string, $encoding);
-        };
-
         do {
             $title = sprintf('  [%s]  ', get_class($e));
-            $len = $strlen($title);
+
+            $len = $this->stringWidth($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
-            $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : (defined('HHVM_VERSION') ? 1 << 31 : PHP_INT_MAX);
+            if (defined('HHVM_VERSION') && $width > 1 << 31) {
+                $width = 1 << 31;
+            }
             $formatter = $output->getFormatter();
             $lines = array();
             foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
-                foreach (str_split($line, $width - 4) as $line) {
+                foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                     // pre-format lines to get the right string length
-                    $lineLength = $strlen(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
+                    $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
                     $lines[] = array($line, $lineLength);
 
                     $len = max($lineLength, $len);
@@ -711,7 +704,7 @@ public function renderException($e, $output)
 
             $messages = array('', '');
             $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
-            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $strlen($title)))));
+            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));
             foreach ($lines as $line) {
                 $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
             }
@@ -878,7 +871,7 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
      * @param InputInterface  $input   An Input instance
      * @param OutputInterface $output  An Output instance
      *
-     * @return int     0 if everything went fine, or an error code
+     * @return int 0 if everything went fine, or an error code
      */
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
     {
@@ -1098,4 +1091,53 @@ private function findAlternatives($name, $collection)
 
         return array_keys($alternatives);
     }
+
+    private function stringWidth($string)
+    {
+        if (!function_exists('mb_strwidth')) {
+            return strlen($string);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            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.
+        // additionally, array_slice() is not enough as some character has doubled width.
+        // we need a function to split string not by character count but by string width
+
+        if (!function_exists('mb_strwidth')) {
+            return str_split($string, $width);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return str_split($string, $width);
+        }
+
+        $utf8String = mb_convert_encoding($string, 'utf8', $encoding);
+        $lines = array();
+        $line = '';
+        foreach (preg_split('//u', $utf8String) as $char) {
+            // test if $char could be appended to current line
+            if (mb_strwidth($line.$char, 'utf8') <= $width) {
+                $line .= $char;
+                continue;
+            }
+            // if not, push current line to array and make new line
+            $lines[] = str_pad($line, $width);
+            $line = $char;
+        }
+        if (strlen($line)) {
+            $lines[] = count($lines) ? str_pad($line, $width) : $line;
+        }
+
+        mb_convert_variables($encoding, 'utf8', $lines);
+
+        return $lines;
+    }
 }
diff --git a/vendor/symfony/console/Symfony/Component/Console/Helper/Helper.php b/vendor/symfony/console/Symfony/Component/Console/Helper/Helper.php
index 0d3ff3af0..b2a8389fa 100755
--- a/vendor/symfony/console/Symfony/Component/Console/Helper/Helper.php
+++ b/vendor/symfony/console/Symfony/Component/Console/Helper/Helper.php
@@ -49,7 +49,7 @@ public function getHelperSet()
      */
     protected function strlen($string)
     {
-        if (!function_exists('mb_strlen')) {
+        if (!function_exists('mb_strwidth')) {
             return strlen($string);
         }
 
@@ -57,6 +57,6 @@ protected function strlen($string)
             return strlen($string);
         }
 
-        return mb_strlen($string, $encoding);
+        return mb_strwidth($string, $encoding);
     }
 }
diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php b/vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php
index 92bf32ba5..32a23aaaa 100755
--- a/vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -523,6 +523,37 @@ public function testRenderException()
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $tester->getDisplay(true), '->renderException() wraps messages when they are bigger than the terminal');
     }
 
+    public function testRenderExceptionWithDoubleWidthCharacters()
+    {
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('エラーメッセージ');
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth1.txt', $tester->getDisplay(true), '->renderException() renderes a pretty exceptions with previous exceptions');
+
+        $tester->run(array('command' => 'foo'), array('decorated' => true));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth1decorated.txt', $tester->getDisplay(true), '->renderException() renderes a pretty exceptions with previous exceptions');
+
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(32));
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('コマンドの実行中にエラーが発生しました。');
+        });
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth2.txt', $tester->getDisplay(true), '->renderException() wraps messages when they are bigger than the terminal');
+    }
+
     public function testRun()
     {
         $application = new Application();
diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
new file mode 100755
index 000000000..6a9866036
--- /dev/null
+++ b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@@ -0,0 +1,11 @@
+
+
+                    
+  [Exception]       
+  エラーメッセージ  
+                    
+
+
+foo
+
+
diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
new file mode 100755
index 000000000..c68a60f56
--- /dev/null
+++ b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@@ -0,0 +1,11 @@
+
+
+                    
+  [Exception]       
+  エラーメッセージ  
+                    
+
+
+foo
+
+
diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
new file mode 100755
index 000000000..545cd7b0b
--- /dev/null
+++ b/vendor/symfony/console/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -0,0 +1,12 @@
+
+
+                              
+  [Exception]                 
+  コマンドの実行中にエラーが  
+  発生しました。              
+                              
+
+
+foo
+
+
diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php b/vendor/symfony/console/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
index 87a45e1d4..db61de4f6 100755
--- a/vendor/symfony/console/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
+++ b/vendor/symfony/console/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
@@ -54,7 +54,7 @@ public function testFormatBlock()
 
     public function testFormatBlockWithDiacriticLetters()
     {
-        if (!extension_loaded('mbstring')) {
+        if (!function_exists('mb_detect_encoding')) {
             $this->markTestSkipped('This test requires mbstring to work.');
         }
 
@@ -69,6 +69,21 @@ public function testFormatBlockWithDiacriticLetters()
         );
     }
 
+    public function testFormatBlockWithDoubleWidthDiacriticLetters()
+    {
+        if (!extension_loaded('mbstring')) {
+            $this->markTestSkipped('This test requires mbstring to work.');
+        }
+        $formatter = new FormatterHelper();
+        $this->assertEquals(
+            '<error>                    </error>'."\n" .
+            '<error>  表示するテキスト  </error>'."\n" .
+            '<error>                    </error>',
+            $formatter->formatBlock('表示するテキスト', 'error', true),
+            '::formatBlock() formats a message in a block'
+        );
+    }
+
     public function testFormatBlockLGEscaping()
     {
         $formatter = new FormatterHelper();
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
index c90fc1044..921fc393a 100755
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
@@ -65,14 +65,18 @@ public function escapeUnicodeAndNewLine($value)
      */
     private function replaceUnicodeSequences($value)
     {
-        return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function (array $match) {
-            $code = $match[1];
+        return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) {
+            $c = hexdec($match[1]);
 
-            if (bin2hex($code) > 0xFFFD) {
-                $code = '\\FFFD';
+            if (0x80 > $c %= 0x200000) {
+                return chr($c);
+            }
+            if (0x800 > $c) {
+                return chr(0xC0 | $c>>6).chr(0x80 | $c & 0x3F);
+            }
+            if (0x10000 > $c) {
+                return chr(0xE0 | $c>>12).chr(0x80 | $c>>6 & 0x3F).chr(0x80 | $c & 0x3F);
             }
-
-            return mb_convert_encoding(pack('H*', $code), 'UTF-8', 'UCS-2BE');
         }, $value);
     }
 }
diff --git a/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php b/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
index 4974dc588..e865f3792 100755
--- a/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
+++ b/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
@@ -144,6 +144,13 @@ function ($row) {
             if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                 require __DIR__.'/Exception/ContextErrorException.php';
             }
+            if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {
+                require __DIR__.'/Exception/FlattenException.php';
+            }
+
+            if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
+                unset($context['GLOBALS']);
+            }
 
             $exception = new ContextErrorException(sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line), 0, $level, $file, $line, $context);
 
diff --git a/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index 0ffd0ab32..e764b4db5 100755
--- a/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -181,18 +181,18 @@ public function testHandle()
     {
         try {
             $handler = ErrorHandler::register(0);
-            $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, array()));
 
             restore_error_handler();
 
             $handler = ErrorHandler::register(3);
-            $this->assertFalse($handler->handle(4, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertFalse($handler->handle(4, 'foo', 'foo.php', 12, array()));
 
             restore_error_handler();
 
             $handler = ErrorHandler::register(3);
             try {
-                $handler->handle(111, 'foo', 'foo.php', 12, 'foo');
+                $handler->handle(111, 'foo', 'foo.php', 12, array());
             } catch (\ErrorException $e) {
                 $this->assertSame('111: foo in foo.php line 12', $e->getMessage());
                 $this->assertSame(111, $e->getSeverity());
@@ -203,12 +203,12 @@ public function testHandle()
             restore_error_handler();
 
             $handler = ErrorHandler::register(E_USER_DEPRECATED);
-            $this->assertTrue($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertTrue($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
 
             restore_error_handler();
 
             $handler = ErrorHandler::register(E_DEPRECATED);
-            $this->assertTrue($handler->handle(E_DEPRECATED, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertTrue($handler->handle(E_DEPRECATED, 'foo', 'foo.php', 12, array()));
 
             restore_error_handler();
 
@@ -231,7 +231,7 @@ public function testHandle()
 
             $handler = ErrorHandler::register(E_USER_DEPRECATED);
             $handler->setLogger($logger);
-            $handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, 'foo');
+            $handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array());
 
             restore_error_handler();
         } catch (\Exception $e) {
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
index 7d536ca52..907ae7387 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
@@ -668,8 +668,9 @@ public function selectLink($value)
      */
     public function selectButton($value)
     {
-        $xpath = sprintf('//input[((@type="submit" or @type="button") and contains(concat(\' \', normalize-space(string(@value)), \' \'), %s)) ', static::xpathLiteral(' '.$value.' ')).
-                         sprintf('or (@type="image" and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)) or @id="%s" or @name="%s"] ', static::xpathLiteral(' '.$value.' '), $value, $value).
+        $translate = 'translate(@type, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")';
+        $xpath = sprintf('//input[((contains(%s, "submit") or contains(%s, "button")) and contains(concat(\' \', normalize-space(string(@value)), \' \'), %s)) ', $translate, $translate, static::xpathLiteral(' '.$value.' ')).
+                         sprintf('or (contains(%s, "image") and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)) or @id="%s" or @name="%s"] ', $translate, static::xpathLiteral(' '.$value.' '), $value, $value).
                          sprintf('| //button[contains(concat(\' \', normalize-space(string(.)), \' \'), %s) or @id="%s" or @name="%s"]', static::xpathLiteral(' '.$value.' '), $value, $value);
 
         return $this->filterXPath($xpath);
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index b0f6b2ad1..9af67c13f 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -123,10 +123,10 @@ public function untick()
      */
     public function setValue($value)
     {
-        if ('checkbox' == $this->type && false === $value) {
+        if ('checkbox' === $this->type && false === $value) {
             // uncheck
             $this->value = null;
-        } elseif ('checkbox' == $this->type && true === $value) {
+        } elseif ('checkbox' === $this->type && true === $value) {
             // check
             $this->value = $this->options[0]['value'];
         } else {
@@ -167,14 +167,14 @@ public function setValue($value)
      */
     public function addChoice(\DOMNode $node)
     {
-        if (!$this->multiple && 'radio' != $this->type) {
+        if (!$this->multiple && 'radio' !== $this->type) {
             throw new \LogicException(sprintf('Unable to add a choice for "%s" as it is not multiple or is not a radio button.', $this->name));
         }
 
         $option = $this->buildOptionValue($node);
         $this->options[] = $option;
 
-        if ($node->getAttribute('checked')) {
+        if ($node->hasAttribute('checked')) {
             $this->value = $option['value'];
         }
     }
@@ -206,11 +206,11 @@ public function isMultiple()
      */
     protected function initialize()
     {
-        if ('input' != $this->node->nodeName && 'select' != $this->node->nodeName) {
+        if ('input' !== $this->node->nodeName && 'select' !== $this->node->nodeName) {
             throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input or select tag (%s given).', $this->node->nodeName));
         }
 
-        if ('input' == $this->node->nodeName && 'checkbox' != $this->node->getAttribute('type') && 'radio' != $this->node->getAttribute('type')) {
+        if ('input' === $this->node->nodeName && 'checkbox' !== strtolower($this->node->getAttribute('type')) && 'radio' !== strtolower($this->node->getAttribute('type'))) {
             throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input tag with a type of checkbox or radio (given type is %s).', $this->node->getAttribute('type')));
         }
 
@@ -219,11 +219,11 @@ protected function initialize()
         $this->multiple = false;
 
         if ('input' == $this->node->nodeName) {
-            $this->type = $this->node->getAttribute('type');
+            $this->type = strtolower($this->node->getAttribute('type'));
             $optionValue = $this->buildOptionValue($this->node);
             $this->options[] = $optionValue;
 
-            if ($this->node->getAttribute('checked')) {
+            if ($this->node->hasAttribute('checked')) {
                 $this->value = $optionValue['value'];
             }
         } else {
@@ -236,22 +236,22 @@ protected function initialize()
 
             $found = false;
             foreach ($this->xpath->query('descendant::option', $this->node) as $option) {
-                $this->options[] = $this->buildOptionValue($option);
+                $optionValue = $this->buildOptionValue($option);
+                $this->options[] = $optionValue;
 
-                if ($option->getAttribute('selected')) {
+                if ($option->hasAttribute('selected')) {
                     $found = true;
                     if ($this->multiple) {
-                        $this->value[] = $option->getAttribute('value');
+                        $this->value[] = $optionValue['value'];
                     } else {
-                        $this->value = $option->getAttribute('value');
+                        $this->value = $optionValue['value'];
                     }
                 }
             }
 
             // if no option is selected and if it is a simple select box, take the first option as the value
-            $option = $this->xpath->query('descendant::option', $this->node)->item(0);
-            if (!$found && !$this->multiple && $option instanceof \DOMElement) {
-                $this->value = $option->getAttribute('value');
+            if (!$found && !$this->multiple && !empty($this->options)) {
+                $this->value = $this->options[0]['value'];
             }
         }
     }
@@ -269,13 +269,13 @@ private function buildOptionValue($node)
 
         $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : '1';
         $option['value'] = $node->hasAttribute('value') ? $node->getAttribute('value') : $defaultValue;
-        $option['disabled'] = ($node->hasAttribute('disabled') && $node->getAttribute('disabled') == 'disabled');
+        $option['disabled'] = $node->hasAttribute('disabled');
 
         return $option;
     }
 
     /**
-     * Checks whether given vale is in the existing options
+     * Checks whether given value is in the existing options
      *
      * @param string $optionValue
      * @param array  $options
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php
index c65b5c9c4..bbdf46799 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php
@@ -99,11 +99,11 @@ public function setFilePath($path)
      */
     protected function initialize()
     {
-        if ('input' != $this->node->nodeName) {
+        if ('input' !== $this->node->nodeName) {
             throw new \LogicException(sprintf('A FileFormField can only be created from an input tag (%s given).', $this->node->nodeName));
         }
 
-        if ('file' != $this->node->getAttribute('type')) {
+        if ('file' !== strtolower($this->node->getAttribute('type'))) {
             throw new \LogicException(sprintf('A FileFormField can only be created from an input tag with a type of file (given type is %s).', $this->node->getAttribute('type')));
         }
 
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php
index d3d395793..b9bd0a482 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php
@@ -30,15 +30,15 @@ class InputFormField extends FormField
      */
     protected function initialize()
     {
-        if ('input' != $this->node->nodeName && 'button' != $this->node->nodeName) {
+        if ('input' !== $this->node->nodeName && 'button' !== $this->node->nodeName) {
             throw new \LogicException(sprintf('An InputFormField can only be created from an input or button tag (%s given).', $this->node->nodeName));
         }
 
-        if ('checkbox' == $this->node->getAttribute('type')) {
+        if ('checkbox' === strtolower($this->node->getAttribute('type'))) {
             throw new \LogicException('Checkboxes should be instances of ChoiceFormField.');
         }
 
-        if ('file' == $this->node->getAttribute('type')) {
+        if ('file' === strtolower($this->node->getAttribute('type'))) {
             throw new \LogicException('File inputs should be instances of FileFormField.');
         }
 
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php
index 242a9d372..a14e70783 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php
@@ -27,7 +27,7 @@ class TextareaFormField extends FormField
      */
     protected function initialize()
     {
-        if ('textarea' != $this->node->nodeName) {
+        if ('textarea' !== $this->node->nodeName) {
             throw new \LogicException(sprintf('A TextareaFormField can only be created from a textarea tag (%s given).', $this->node->nodeName));
         }
 
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php
index 144498f32..38390091a 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php
@@ -28,7 +28,7 @@ class Form extends Link implements \ArrayAccess
     private $button;
 
     /**
-     * @var Field\FormField[]
+     * @var FormFieldRegistry
      */
     private $fields;
 
@@ -368,7 +368,7 @@ public function disableValidation()
     protected function setNode(\DOMNode $node)
     {
         $this->button = $node;
-        if ('button' == $node->nodeName || ('input' == $node->nodeName && in_array($node->getAttribute('type'), array('submit', 'button', 'image')))) {
+        if ('button' === $node->nodeName || ('input' === $node->nodeName && in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image')))) {
             if ($node->hasAttribute('form')) {
                 // if the node has the HTML5-compliant 'form' attribute, use it
                 $formId = $node->getAttribute('form');
@@ -385,8 +385,8 @@ protected function setNode(\DOMNode $node)
                 if (null === $node = $node->parentNode) {
                     throw new \LogicException('The selected node does not have a form ancestor.');
                 }
-            } while ('form' != $node->nodeName);
-        } elseif ('form' != $node->nodeName) {
+            } while ('form' !== $node->nodeName);
+        } elseif ('form' !== $node->nodeName) {
             throw new \LogicException(sprintf('Unable to submit on a "%s" tag.', $node->nodeName));
         }
 
@@ -410,7 +410,7 @@ private function initialize()
 
         // add submitted button if it has a valid name
         if ('form' !== $this->button->nodeName && $this->button->hasAttribute('name') && $this->button->getAttribute('name')) {
-            if ('input' == $this->button->nodeName && 'image' == $this->button->getAttribute('type')) {
+            if ('input' == $this->button->nodeName && 'image' == strtolower($this->button->getAttribute('type'))) {
                 $name = $this->button->getAttribute('name');
                 $this->button->setAttribute('value', '0');
 
@@ -461,17 +461,17 @@ private function addField(\DOMNode $node)
         }
 
         $nodeName = $node->nodeName;
-        if ('select' == $nodeName || 'input' == $nodeName && 'checkbox' == $node->getAttribute('type')) {
+        if ('select' == $nodeName || 'input' == $nodeName && 'checkbox' == strtolower($node->getAttribute('type'))) {
             $this->set(new Field\ChoiceFormField($node));
-        } elseif ('input' == $nodeName && 'radio' == $node->getAttribute('type')) {
+        } elseif ('input' == $nodeName && 'radio' == strtolower($node->getAttribute('type'))) {
             if ($this->has($node->getAttribute('name'))) {
                 $this->get($node->getAttribute('name'))->addChoice($node);
             } else {
                 $this->set(new Field\ChoiceFormField($node));
             }
-        } elseif ('input' == $nodeName && 'file' == $node->getAttribute('type')) {
+        } elseif ('input' == $nodeName && 'file' == strtolower($node->getAttribute('type'))) {
             $this->set(new Field\FileFormField($node));
-        } elseif ('input' == $nodeName && !in_array($node->getAttribute('type'), array('submit', 'button', 'image'))) {
+        } elseif ('input' == $nodeName && !in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image'))) {
             $this->set(new Field\InputFormField($node));
         } elseif ('textarea' == $nodeName) {
             $this->set(new Field\TextareaFormField($node));
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php
index f37e05025..150f94dfc 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -137,7 +137,7 @@ public function set($name, $value)
     /**
      * Returns the list of field with their value.
      *
-     * @return array The list of fields as array((string) Fully qualified name => (mixed) value)
+     * @return FormField[] The list of fields as array((string) Fully qualified name => (mixed) value)
      */
     public function all()
     {
@@ -196,7 +196,7 @@ private function walk(array $array, $base = '', array &$output = array())
      *
      * @param string $name The name of the field
      *
-     * @return array The list of segments
+     * @return string[] The list of segments
      *
      * @throws \InvalidArgumentException when the name is malformed
      */
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php
index d662f8937..05d5e927a 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php
@@ -188,7 +188,7 @@ protected function canonicalizePath($path)
      */
     protected function setNode(\DOMNode $node)
     {
-        if ('a' != $node->nodeName && 'area' != $node->nodeName) {
+        if ('a' !== $node->nodeName && 'area' !== $node->nodeName) {
             throw new \LogicException(sprintf('Unable to click on a "%s" tag.', $node->nodeName));
         }
 
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
index d2a95a53e..c2970f613 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
@@ -73,6 +73,11 @@ public function testIsMultiple()
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->isMultiple(), '->isMultiple() returns true for selects with the multiple attribute');
+
+        $node = $this->createNode('select', '', array('multiple' => ''));
+        $field = new ChoiceFormField($node);
+
+        $this->assertTrue($field->isMultiple(), '->isMultiple() returns true for selects with an empty multiple attribute');
     }
 
     public function testSelects()
@@ -107,6 +112,14 @@ public function testSelects()
         }
     }
 
+    public function testSelectWithEmptyBooleanAttribute()
+    {
+        $node = $this->createSelectNode(array('foo' => false, 'bar' => true), array(), '');
+        $field = new ChoiceFormField($node);
+
+        $this->assertEquals('bar', $field->getValue());
+    }
+
     public function testMultipleSelects()
     {
         $node = $this->createSelectNode(array('foo' => false, 'bar' => false), array('multiple' => 'multiple'));
@@ -166,12 +179,25 @@ public function testRadioButtons()
         }
     }
 
+    public function testRadioButtonsWithEmptyBooleanAttribute()
+    {
+        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $field = new ChoiceFormField($node);
+        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar', 'checked' => ''));
+        $field->addChoice($node);
+
+        $this->assertTrue($field->hasValue(), '->hasValue() returns true when a radio button is selected');
+        $this->assertEquals('bar', $field->getValue(), '->getValue() returns the value attribute of the selected radio button');
+    }
+
     public function testRadioButtonIsDisabled()
     {
         $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo', 'disabled' => 'disabled'));
         $field = new ChoiceFormField($node);
         $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar'));
         $field->addChoice($node);
+        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'baz', 'disabled' => ''));
+        $field->addChoice($node);
 
         $field->select('foo');
         $this->assertEquals('foo', $field->getValue(), '->getValue() returns the value attribute of the selected radio button');
@@ -180,6 +206,10 @@ public function testRadioButtonIsDisabled()
         $field->select('bar');
         $this->assertEquals('bar', $field->getValue(), '->getValue() returns the value attribute of the selected radio button');
         $this->assertFalse($field->isDisabled());
+
+        $field->select('baz');
+        $this->assertEquals('baz', $field->getValue(), '->getValue() returns the value attribute of the selected radio button');
+        $this->assertTrue($field->isDisabled());
     }
 
     public function testCheckboxes()
@@ -225,6 +255,15 @@ public function testCheckboxes()
         }
     }
 
+    public function testCheckboxWithEmptyBooleanAttribute()
+    {
+        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'value' => 'foo', 'checked' => ''));
+        $field = new ChoiceFormField($node);
+
+        $this->assertTrue($field->hasValue(), '->hasValue() returns true when the checkbox is checked');
+        $this->assertEquals('foo', $field->getValue());
+    }
+
     public function testTick()
     {
         $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
@@ -280,6 +319,11 @@ public function testOptionWithNoValue()
     {
         $node = $this->createSelectNodeWithEmptyOption(array('foo' => false, 'bar' => false));
         $field = new ChoiceFormField($node);
+        $this->assertEquals('foo', $field->getValue());
+
+        $node = $this->createSelectNodeWithEmptyOption(array('foo' => false, 'bar' => true));
+        $field = new ChoiceFormField($node);
+        $this->assertEquals('bar', $field->getValue());
         $field->select('foo');
         $this->assertEquals('foo', $field->getValue(), '->select() changes the selected option');
     }
@@ -299,7 +343,7 @@ public function testDisableValidation()
         $this->assertEquals(array('foobar'), $field->getValue(), '->disableValidation() allows to set a value which is not in the selected options.');
     }
 
-    protected function createSelectNode($options, $attributes = array())
+    protected function createSelectNode($options, $attributes = array(), $selectedAttrText = 'selected')
     {
         $document = new \DOMDocument();
         $node = $document->createElement('select');
@@ -313,7 +357,7 @@ protected function createSelectNode($options, $attributes = array())
             $option = $document->createElement('option', $value);
             $option->setAttribute('value', $value);
             if ($selected) {
-                $option->setAttribute('selected', 'selected');
+                $option->setAttribute('selected', $selectedAttrText);
             }
             $node->appendChild($option);
         }
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php
index fca7f6b75..f4a0fb107 100755
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php
+++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -651,6 +651,13 @@ public function testSubmitWithoutAFormButton()
         $this->assertSame($nodes->item(0), $form->getFormNode(), '->getFormNode() returns the form node associated with this form');
     }
 
+    public function testTypeAttributeIsCaseInsensitive()
+    {
+        $form = $this->createForm('<form method="post"><input type="IMAGE" name="example" /></form>');
+        $this->assertTrue($form->has('example.x'), '->has() returns true if the image input was correctly turned into an x and a y fields');
+        $this->assertTrue($form->has('example.y'), '->has() returns true if the image input was correctly turned into an x and a y fields');
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */
@@ -806,7 +813,6 @@ protected function createForm($form, $method = null, $currentUri = null)
         $dom = new \DOMDocument();
         $dom->loadHTML('<html>'.$form.'</html>');
 
-        $nodes = $dom->getElementsByTagName('input');
         $xPath = new \DOMXPath($dom);
         $nodes = $xPath->query('//input | //button');
 
@@ -869,5 +875,4 @@ public function testgetPhpValuesWithEmptyTextarea()
       $form = new Form($nodes->item(0), 'http://example.com');
       $this->assertEquals($form->getPhpValues(), array('example' => ''));
     }
-
 }
diff --git a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json b/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
index 6343b5d1d..3715ece30 100755
--- a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
+++ b/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
@@ -20,6 +20,7 @@
     },
     "require-dev": {
         "symfony/dependency-injection": "~2.0",
+        "symfony/config": "~2.0",
         "symfony/stopwatch": "~2.2",
         "psr/log": "~1.0"
     },
diff --git a/vendor/symfony/finder/Symfony/Component/Finder/Finder.php b/vendor/symfony/finder/Symfony/Component/Finder/Finder.php
index e945fab13..db4d85174 100755
--- a/vendor/symfony/finder/Symfony/Component/Finder/Finder.php
+++ b/vendor/symfony/finder/Symfony/Component/Finder/Finder.php
@@ -94,7 +94,7 @@ public static function create()
      *
      * @return Finder The current Finder instance
      */
-    public function addAdapter(Adapter\AdapterInterface $adapter, $priority = 0)
+    public function addAdapter(AdapterInterface $adapter, $priority = 0)
     {
         $this->adapters[$adapter->getName()] = array(
             'adapter'  => $adapter,
diff --git a/vendor/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/vendor/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index de9450dc1..9543a3f76 100755
--- a/vendor/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/vendor/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -68,7 +68,14 @@ public function current()
     public function getChildren()
     {
         try {
-            return parent::getChildren();
+            $children = parent::getChildren();
+
+            if ($children instanceof self) {
+                // parent method will call the constructor with default arguments, so unreadable dirs won't be ignored anymore
+                $children->ignoreUnreadableDirs = $this->ignoreUnreadableDirs;
+            }
+
+            return $children;
         } catch (\UnexpectedValueException $e) {
             if ($this->ignoreUnreadableDirs) {
                 // If directory is unreadable and finder is set to ignore it, a fake empty content is returned.
diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index cc5cf23fa..986dde1ac 100755
--- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -81,7 +81,9 @@ public static function create($file = null, $status = 200, $headers = array(), $
      */
     public function setFile($file, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
     {
-        $file = new File((string) $file);
+        if (!$file instanceof File) {
+            $file = new File((string) $file);
+        }
 
         if (!$file->isReadable()) {
             throw new FileException('File must be readable.');
diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
index 24280e38f..9557135bc 100755
--- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
+++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
@@ -12,6 +12,14 @@
 /**
  * SessionHandlerInterface for PHP < 5.4
  *
+ * The order in which these methods are invoked by PHP are:
+ * 1. open [session_start]
+ * 2. read
+ * 3. gc [optional depending on probability settings: gc_probability / gc_divisor]
+ * 4. destroy [optional when session_regenerate_id(true) is used]
+ * 5. write [session_write_close] or destroy [session_destroy]
+ * 6. close
+ *
  * Extensive documentation can be found at php.net, see links:
  *
  * @see http://php.net/sessionhandlerinterface
@@ -19,6 +27,7 @@
  * @see http://php.net/session-set-save-handler
  *
  * @author Drak <drak@zikula.org>
+ * @author Tobias Schultze <http://tobion.de>
  */
 interface SessionHandlerInterface
 {
@@ -57,6 +66,9 @@ public function read($sessionId);
     /**
      * Writes the session data to the storage.
      *
+     * Care, the session ID passed to write() can be different from the one previously
+     * received in read() when the session ID changed due to session_regenerate_id().
+     *
      * @see http://php.net/sessionhandlerinterface.write
      *
      * @param string $sessionId Session ID , see http://php.net/function.session-id
diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index b831383a2..4cdf3a898 100755
--- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -12,7 +12,19 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
- * PdoSessionHandler.
+ * Session handler using a PDO connection to read and write data.
+ *
+ * It works with MySQL, PostgreSQL, Oracle, SQL Server and SQLite and implements
+ * locking of sessions to prevent loss of data by concurrent access to the same session.
+ * This means requests for the same session will wait until the other one finished.
+ * PHPs internal files session handler also works this way.
+ *
+ * Attention: Since SQLite does not support row level locks but locks the whole database,
+ * it means only one session can be accessed at a time. Even different sessions would wait
+ * for another to finish. So saving session in SQLite should only be considered for
+ * development or prototypes.
+ *
+ * @see http://php.net/sessionhandlerinterface
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Michael Williams <michael.williams@funsational.com>
@@ -25,6 +37,11 @@ class PdoSessionHandler implements \SessionHandlerInterface
      */
     private $pdo;
 
+    /**
+     * @var string Database driver
+     */
+    private $driver;
+
     /**
      * @var string Table name
      */
@@ -45,39 +62,50 @@ class PdoSessionHandler implements \SessionHandlerInterface
      */
     private $timeCol;
 
+    /**
+     * @var bool Whether a transaction is active
+     */
+    private $inTransaction = false;
+
+    /**
+     * @var bool Whether gc() has been called
+     */
+    private $gcCalled = false;
+
     /**
      * Constructor.
      *
      * List of available options:
-     *  * db_table: The name of the table [required]
+     *  * db_table: The name of the table [default: sessions]
      *  * db_id_col: The column where to store the session id [default: sess_id]
      *  * db_data_col: The column where to store the session data [default: sess_data]
      *  * db_time_col: The column where to store the timestamp [default: sess_time]
      *
-     * @param \PDO  $pdo       A \PDO instance
-     * @param array $dbOptions An associative array of DB options
+     * @param \PDO  $pdo     A \PDO instance
+     * @param array $options An associative array of DB options
      *
-     * @throws \InvalidArgumentException When "db_table" option is not provided
+     * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      */
-    public function __construct(\PDO $pdo, array $dbOptions = array())
+    public function __construct(\PDO $pdo, array $options = array())
     {
-        if (!array_key_exists('db_table', $dbOptions)) {
-            throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoSessionStorage.');
-        }
         if (\PDO::ERRMODE_EXCEPTION !== $pdo->getAttribute(\PDO::ATTR_ERRMODE)) {
             throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
         }
+
         $this->pdo = $pdo;
-        $dbOptions = array_merge(array(
+        $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+
+        $options = array_replace(array(
+            'db_table'    => 'sessions',
             'db_id_col'   => 'sess_id',
             'db_data_col' => 'sess_data',
             'db_time_col' => 'sess_time',
-        ), $dbOptions);
+        ), $options);
 
-        $this->table = $dbOptions['db_table'];
-        $this->idCol = $dbOptions['db_id_col'];
-        $this->dataCol = $dbOptions['db_data_col'];
-        $this->timeCol = $dbOptions['db_time_col'];
+        $this->table = $options['db_table'];
+        $this->idCol = $options['db_id_col'];
+        $this->dataCol = $options['db_data_col'];
+        $this->timeCol = $options['db_time_col'];
     }
 
     /**
@@ -85,34 +113,45 @@ public function __construct(\PDO $pdo, array $dbOptions = array())
      */
     public function open($savePath, $sessionName)
     {
-        return true;
-    }
+        $this->gcCalled = false;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
         return true;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function destroy($sessionId)
+    public function read($sessionId)
     {
-        // delete the record associated with this id
-        $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
+        $this->beginTransaction();
 
         try {
+            $this->lockSession($sessionId);
+
+            // We need to make sure we do not return session data that is already considered garbage according
+            // to the session.gc_maxlifetime setting because gc() is called after read() and only sometimes.
+            $maxlifetime = (int) ini_get('session.gc_maxlifetime');
+
+            $sql = "SELECT $this->dataCol FROM $this->table WHERE $this->idCol = :id AND $this->timeCol > :time";
+
             $stmt = $this->pdo->prepare($sql);
             $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+            $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
             $stmt->execute();
+
+            // We use fetchAll instead of fetchColumn to make sure the DB cursor gets closed
+            $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
+
+            if ($sessionRows) {
+                return base64_decode($sessionRows[0][0]);
+            }
+
+            return '';
         } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete a session: %s', $e->getMessage()), 0, $e);
-        }
+            $this->rollback();
 
-        return true;
+            throw $e;
+        }
     }
 
     /**
@@ -120,16 +159,9 @@ public function destroy($sessionId)
      */
     public function gc($maxlifetime)
     {
-        // delete the session records that have expired
-        $sql = "DELETE FROM $this->table WHERE $this->timeCol < :time";
-
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete expired sessions: %s', $e->getMessage()), 0, $e);
-        }
+        // We delay gc() to close() so that it is executed outside the transactional and blocking read-write process.
+        // This way, pruning expired sessions does not block them from being started while the current session is used.
+        $this->gcCalled = true;
 
         return true;
     }
@@ -137,26 +169,22 @@ public function gc($maxlifetime)
     /**
      * {@inheritdoc}
      */
-    public function read($sessionId)
+    public function destroy($sessionId)
     {
-        $sql = "SELECT $this->dataCol FROM $this->table WHERE $this->idCol = :id";
+        // delete the record associated with this id
+        $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
 
         try {
             $stmt = $this->pdo->prepare($sql);
             $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
             $stmt->execute();
-
-            // We use fetchAll instead of fetchColumn to make sure the DB cursor gets closed
-            $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
-
-            if ($sessionRows) {
-                return base64_decode($sessionRows[0][0]);
-            }
-
-            return '';
         } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to read the session data: %s', $e->getMessage()), 0, $e);
+            $this->rollback();
+
+            throw $e;
         }
+
+        return true;
     }
 
     /**
@@ -167,8 +195,10 @@ public function write($sessionId, $data)
         // Session data can contain non binary safe characters so we need to encode it.
         $encoded = base64_encode($data);
 
+        // The session ID can be different from the one previously received in read()
+        // when the session ID changed due to session_regenerate_id(). So we have to
+        // do an insert or update even if we created a row in read() for locking.
         // We use a MERGE SQL query when supported by the database.
-        // Otherwise we have to use a transactional DELETE followed by INSERT to prevent duplicate entries under high concurrency.
 
         try {
             $mergeSql = $this->getMergeSql();
@@ -183,15 +213,18 @@ public function write($sessionId, $data)
                 return true;
             }
 
-            $this->pdo->beginTransaction();
-
-            try {
-                $deleteStmt = $this->pdo->prepare(
-                    "DELETE FROM $this->table WHERE $this->idCol = :id"
-                );
-                $deleteStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                $deleteStmt->execute();
-
+            $updateStmt = $this->pdo->prepare(
+                "UPDATE $this->table SET $this->dataCol = :data, $this->timeCol = :time WHERE $this->idCol = :id"
+            );
+            $updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+            $updateStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
+            $updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
+            $updateStmt->execute();
+
+            // Since we have a lock on the session, this is safe to do. Otherwise it would be prone to
+            // race conditions in high concurrency. And if it's a regenerated session ID it should be
+            // unique anyway.
+            if (!$updateStmt->rowCount()) {
                 $insertStmt = $this->pdo->prepare(
                     "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)"
                 );
@@ -199,18 +232,153 @@ public function write($sessionId, $data)
                 $insertStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
                 $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
                 $insertStmt->execute();
+            }
+        } catch (\PDOException $e) {
+            $this->rollback();
+
+            throw $e;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $this->commit();
+
+        if ($this->gcCalled) {
+            $maxlifetime = (int) ini_get('session.gc_maxlifetime');
+
+            // delete the session records that have expired
+            $sql = "DELETE FROM $this->table WHERE $this->timeCol <= :time";
 
-                $this->pdo->commit();
+            $stmt = $this->pdo->prepare($sql);
+            $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
+            $stmt->execute();
+        }
+
+        return true;
+    }
+
+    /**
+     * Helper method to begin a transaction.
+     *
+     * Since SQLite does not support row level locks, we have to acquire a reserved lock
+     * on the database immediately. Because of https://bugs.php.net/42766 we have to create
+     * such a transaction manually which also means we cannot use PDO::commit or
+     * PDO::rollback or PDO::inTransaction for SQLite.
+     */
+    private function beginTransaction()
+    {
+        if ($this->inTransaction) {
+            $this->rollback();
+
+            throw new \BadMethodCallException(
+                'Session handler methods have been invoked in wrong sequence. ' .
+                'Expected sequence: open() -> read() -> destroy() / write() -> close()');
+        }
+
+        if ('sqlite' === $this->driver) {
+            $this->pdo->exec('BEGIN IMMEDIATE TRANSACTION');
+        } else {
+            $this->pdo->beginTransaction();
+        }
+        $this->inTransaction = true;
+    }
+
+    /**
+     * Helper method to commit a transaction.
+     */
+    private function commit()
+    {
+        if ($this->inTransaction) {
+            try {
+                // commit read-write transaction which also releases the lock
+                if ('sqlite' === $this->driver) {
+                    $this->pdo->exec('COMMIT');
+                } else {
+                    $this->pdo->commit();
+                }
+                $this->inTransaction = false;
             } catch (\PDOException $e) {
-                $this->pdo->rollback();
+                $this->rollback();
 
                 throw $e;
             }
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to write the session data: %s', $e->getMessage()), 0, $e);
         }
+    }
 
-        return true;
+    /**
+     * Helper method to rollback a transaction.
+     */
+    private function rollback()
+    {
+        // We only need to rollback if we are in a transaction. Otherwise the resulting
+        // error would hide the real problem why rollback was called. We might not be
+        // in a transaction when two callbacks (e.g. destroy and write) are invoked that
+        // both fail.
+        if ($this->inTransaction) {
+            if ('sqlite' === $this->driver) {
+                $this->pdo->exec('ROLLBACK');
+            } else {
+                $this->pdo->rollback();
+            }
+            $this->inTransaction = false;
+        }
+    }
+
+    /**
+     * Exclusively locks the row so other concurrent requests on the same session will block.
+     *
+     * This prevents loss of data by keeping the data consistent between read() and write().
+     * We do not use SELECT FOR UPDATE because it does not lock non-existent rows. And a following
+     * INSERT when not found can result in a deadlock for one connection.
+     *
+     * @param string $sessionId Session ID
+     */
+    private function lockSession($sessionId)
+    {
+        switch ($this->driver) {
+            case 'mysql':
+                // will also lock the row when actually nothing got updated (id = id)
+                $sql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
+                    "ON DUPLICATE KEY UPDATE $this->idCol = $this->idCol";
+                break;
+            case 'oci':
+                // DUAL is Oracle specific dummy table
+                $sql = "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) " .
+                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
+                    "WHEN MATCHED THEN UPDATE SET $this->idCol = $this->idCol";
+                break;
+            case 'sqlsrv':
+                // MS SQL Server requires MERGE be terminated by semicolon
+                $sql = "MERGE INTO $this->table USING (SELECT 'x' AS dummy) AS src ON ($this->idCol = :id) " .
+                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
+                    "WHEN MATCHED THEN UPDATE SET $this->idCol = $this->idCol;";
+                break;
+            case 'pgsql':
+                // obtain an exclusive transaction level advisory lock
+                $sql = 'SELECT pg_advisory_xact_lock(:lock_id)';
+                $stmt = $this->pdo->prepare($sql);
+                $stmt->bindValue(':lock_id', hexdec(substr($sessionId, 0, 15)), \PDO::PARAM_INT);
+                $stmt->execute();
+
+                return;
+            default:
+                return;
+        }
+
+        // We create a DML lock for the session by inserting empty data or updating the row.
+        // This is safer than an application level advisory lock because it also prevents concurrent modification
+        // of the session from other parts of the application.
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
+        $stmt->bindValue(':data', '', \PDO::PARAM_STR);
+        $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
+        $stmt->execute();
     }
 
     /**
@@ -220,9 +388,7 @@ public function write($sessionId, $data)
      */
     private function getMergeSql()
     {
-        $driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-
-        switch ($driver) {
+        switch ($this->driver) {
             case 'mysql':
                 return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
                     "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->timeCol = VALUES($this->timeCol)";
@@ -230,12 +396,12 @@ private function getMergeSql()
                 // DUAL is Oracle specific dummy table
                 return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) " .
                     "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data";
+                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time";
             case 'sqlsrv':
                 // MS SQL Server requires MERGE be terminated by semicolon
                 return "MERGE INTO $this->table USING (SELECT 'x' AS dummy) AS src ON ($this->idCol = :id) " .
                     "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) " .
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data;";
+                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time;";
             case 'sqlite':
                 return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
         }
diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index e465f3989..109addbcb 100755
--- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -29,74 +29,108 @@ protected function setUp()
         $this->pdo->exec($sql);
     }
 
-    public function testIncompleteOptions()
-    {
-        $this->setExpectedException('InvalidArgumentException');
-        $storage = new PdoSessionHandler($this->pdo, array());
-    }
-
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testWrongPdoErrMode()
     {
-        $pdo = new \PDO("sqlite::memory:");
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
-        $pdo->exec("CREATE TABLE sessions (sess_id VARCHAR(255) PRIMARY KEY, sess_data TEXT, sess_time INTEGER)");
+        $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
 
-        $this->setExpectedException('InvalidArgumentException');
-        $storage = new PdoSessionHandler($pdo, array('db_table' => 'sessions'));
+        $storage = new PdoSessionHandler($this->pdo);
     }
 
-    public function testWrongTableOptionsWrite()
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testInexistentTable()
     {
-        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
-        $this->setExpectedException('RuntimeException');
-        $storage->write('foo', 'bar');
+        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'inexistent_table'));
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
     }
 
-    public function testWrongTableOptionsRead()
+    public function testReadWriteRead()
     {
-        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
-        $this->setExpectedException('RuntimeException');
-        $storage->read('foo', 'bar');
+        $storage = new PdoSessionHandler($this->pdo);
+        $storage->open('', 'sid');
+        $this->assertSame('', $storage->read('id'), 'New session returns empty string data');
+        $storage->write('id', 'data');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $this->assertSame('data', $storage->read('id'), 'Written value can be read back correctly');
+        $storage->close();
     }
 
-    public function testWriteRead()
+    /**
+     * Simulates session_regenerate_id(true) which will require an INSERT or UPDATE (replace)
+     */
+    public function testWriteDifferentSessionIdThanRead()
     {
-        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
-        $storage->write('foo', 'bar');
-        $this->assertEquals('bar', $storage->read('foo'), 'written value can be read back correctly');
+        $storage = new PdoSessionHandler($this->pdo);
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->destroy('id');
+        $storage->write('new_id', 'data_of_new_session_id');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $this->assertSame('data_of_new_session_id', $storage->read('new_id'), 'Data of regenerated session id is available');
+        $storage->close();
     }
 
-    public function testMultipleInstances()
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testWrongUsage()
     {
-        $storage1 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
-        $storage1->write('foo', 'bar');
-
-        $storage2 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
-        $this->assertEquals('bar', $storage2->read('foo'), 'values persist between instances');
+        $storage = new PdoSessionHandler($this->pdo);
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->read('id');
     }
 
     public function testSessionDestroy()
     {
-        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
-        $storage->write('foo', 'bar');
-        $this->assertCount(1, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
-
-        $storage->destroy('foo');
-
-        $this->assertCount(0, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+        $storage = new PdoSessionHandler($this->pdo);
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+        $this->assertEquals(1, $this->pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->destroy('id');
+        $storage->close();
+        $this->assertEquals(0, $this->pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        $storage->open('', 'sid');
+        $this->assertSame('', $storage->read('id'), 'Destroyed session returns empty string');
+        $storage->close();
     }
 
     public function testSessionGC()
     {
-        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'));
-
-        $storage->write('foo', 'bar');
-        $storage->write('baz', 'bar');
-
-        $this->assertCount(2, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
-
-        $storage->gc(-1);
-        $this->assertCount(0, $this->pdo->query('SELECT * FROM sessions')->fetchAll());
+        $previousLifeTime = ini_set('session.gc_maxlifetime', 0);
+        $storage = new PdoSessionHandler($this->pdo);
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+        $this->assertEquals(1, $this->pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        $storage->open('', 'sid');
+        $this->assertSame('', $storage->read('id'), 'Session already considered garbage, so not returning data even if it is not pruned yet');
+        $storage->gc(0);
+        $storage->close();
+        $this->assertEquals(0, $this->pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        ini_set('session.gc_maxlifetime', $previousLifeTime);
     }
 
     public function testGetConnection()
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 4a454d81d..7931f01e6 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -428,12 +428,6 @@ protected function fetch(Request $request, $catch = false)
 
         $response = $this->forward($subRequest, $catch);
 
-        if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
-            $response->setPrivate(true);
-        } elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) {
-            $response->setTtl($this->options['default_ttl']);
-        }
-
         if ($response->isCacheable()) {
             $this->store($request, $response);
         }
@@ -487,6 +481,12 @@ protected function forward(Request $request, $catch = false, Response $entry = n
 
         $this->processResponseBody($request, $response);
 
+        if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
+            $response->setPrivate(true);
+        } elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) {
+            $response->setTtl($this->options['default_ttl']);
+        }
+
         return $response;
     }
 
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
index 81a8877bc..3db37ed13 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\ClassLoader\ClassCollectionLoader;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * The Kernel is the heart of the Symfony system.
@@ -59,11 +60,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION         = '2.4.4-DEV';
-    const VERSION_ID      = '20404';
+    const VERSION         = '2.4.5-DEV';
+    const VERSION_ID      = '20405';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '4';
-    const RELEASE_VERSION = '4';
+    const RELEASE_VERSION = '5';
     const EXTRA_VERSION   = 'DEV';
 
     /**
@@ -714,9 +715,43 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $content = static::stripComments($content);
         }
 
+        $content = $this->removeAbsolutePathsFromContainer($content);
+
         $cache->write($content, $container->getResources());
     }
 
+    /**
+     * Converts absolute paths to relative ones in the dumped container.
+     */
+    private function removeAbsolutePathsFromContainer($content)
+    {
+        if (!class_exists('Symfony\Component\Filesystem\Filesystem')) {
+            return $content;
+        }
+
+        // find the "real" root dir (by finding the composer.json file)
+        $rootDir = $this->getRootDir();
+        $previous = $rootDir;
+        while (!file_exists($rootDir.'/composer.json')) {
+            if ($previous === $rootDir = realpath($rootDir.'/..')) {
+                // unable to detect the project root, give up
+                return $content;
+            }
+
+            $previous = $rootDir;
+        }
+
+        $rootDir = rtrim($rootDir, '/');
+        $cacheDir = $this->getCacheDir();
+        $filesystem = new Filesystem();
+
+        return preg_replace_callback("{'([^']*)(".preg_quote($rootDir)."[^']*)'}", function ($match) use ($filesystem, $cacheDir) {
+            $prefix = isset($match[1]) && $match[1] ? "'$match[1]'.__DIR__.'/" : "__DIR__.'/";
+
+            return $prefix.rtrim($filesystem->makePathRelative($match[2], $cacheDir), '/')."'";
+        }, $content);
+    }
+
     /**
      * Returns a loader for the container.
      *
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php
new file mode 100755
index 000000000..54e0dedc4
--- /dev/null
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php
@@ -0,0 +1,7 @@
+'ROOT_DIR/app/cache/dev/foo'
+'ROOT_DIR/app/cache/foo'
+'ROOT_DIR/foo/bar.php'
+
+'/some/where/else/foo'
+
+'file:ROOT_DIR/app/cache/dev/profiler'
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php
new file mode 100755
index 000000000..09ce8b568
--- /dev/null
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/app/cache/dev/withoutAbsolutePaths.php
@@ -0,0 +1,7 @@
+__DIR__.'/foo'
+__DIR__.'/../foo'
+__DIR__.'/../../../foo/bar.php'
+
+'/some/where/else/foo'
+
+'file:'.__DIR__.'/profiler'
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json
new file mode 100755
index 000000000..0967ef424
--- /dev/null
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/DumpedContainers/composer.json
@@ -0,0 +1 @@
+{}
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
index 5fd61bbc7..c7396dd8a 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
@@ -16,6 +16,11 @@
 
 class KernelForTest extends Kernel
 {
+    public function setRootDir($dir)
+    {
+        $this->rootDir = $dir;
+    }
+
     public function getBundleMap()
     {
         return $this->bundleMap;
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
index 9e3f4a741..f1c467d76 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -582,6 +582,105 @@ public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformation()
         $this->assertTraceContains('fresh');
         $this->assertTraceNotContains('store');
         $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpired()
+    {
+        $this->setNextResponse();
+
+        $this->cacheConfig['default_ttl'] = 2;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+
+        // expires the cache
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+        $tmp = unserialize($values[0]);
+        $tmp[0][1]['date'] = \DateTime::createFromFormat('U', time() - 5)->format(DATE_RFC2822);
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('save');
+        $m->setAccessible(true);
+        $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('invalid');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+
+        $this->setNextResponse();
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpiredWithStatus304()
+    {
+        $this->setNextResponse();
+
+        $this->cacheConfig['default_ttl'] = 2;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        // expires the cache
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+        $tmp = unserialize($values[0]);
+        $tmp[0][1]['date'] = \DateTime::createFromFormat('U', time() - 5)->format(DATE_RFC2822);
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('save');
+        $m->setAccessible(true);
+        $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('valid');
+        $this->assertTraceContains('store');
+        $this->assertTraceNotContains('miss');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
     }
 
     public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirective()
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php
index bc9876df3..30e201fee 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -722,6 +722,34 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
         $kernel->terminate(Request::create('/'), new Response());
     }
 
+    public function testRemoveAbsolutePathsFromContainer()
+    {
+        $kernel = new KernelForTest('dev', true);
+        $kernel->setRootDir($symfonyRootDir = __DIR__.'/Fixtures/DumpedContainers/app');
+
+        $content = file_get_contents($symfonyRootDir.'/cache/dev/withAbsolutePaths.php');
+        $content = str_replace('ROOT_DIR', __DIR__.'/Fixtures/DumpedContainers', $content);
+
+        $m = new \ReflectionMethod($kernel, 'removeAbsolutePathsFromContainer');
+        $m->setAccessible(true);
+        $content = $m->invoke($kernel, $content);
+        $this->assertEquals(file_get_contents($symfonyRootDir.'/cache/dev/withoutAbsolutePaths.php'), $content);
+    }
+
+    public function testRemoveAbsolutePathsFromContainerGiveUpWhenComposerJsonPathNotGuessable()
+    {
+        $kernel = new KernelForTest('dev', true);
+        $kernel->setRootDir($symfonyRootDir = sys_get_temp_dir());
+
+        $content = file_get_contents(__DIR__.'/Fixtures/DumpedContainers/app/cache/dev/withAbsolutePaths.php');
+        $content = str_replace('ROOT_DIR', __DIR__.'/Fixtures/DumpedContainers', $content);
+
+        $m = new \ReflectionMethod($kernel, 'removeAbsolutePathsFromContainer');
+        $m->setAccessible(true);
+        $newContent = $m->invoke($kernel, $content);
+        $this->assertEquals($newContent, $content);
+    }
+
     /**
      * Returns a mock for the BundleInterface
      *
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
index a09b00132..e2598be34 100755
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
+++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json
@@ -29,6 +29,7 @@
         "symfony/console": "~2.2",
         "symfony/dependency-injection": "~2.0",
         "symfony/finder": "~2.0",
+        "symfony/filesystem": "~2.4",
         "symfony/process": "~2.0",
         "symfony/routing": "~2.2",
         "symfony/stopwatch": "~2.2",
@@ -40,7 +41,8 @@
         "symfony/config": "",
         "symfony/console": "",
         "symfony/dependency-injection": "",
-        "symfony/finder": ""
+        "symfony/finder": "",
+        "symfony/filesystem": ""
     },
     "autoload": {
         "psr-0": { "Symfony\\Component\\HttpKernel\\": "" }
diff --git a/vendor/symfony/process/Symfony/Component/Process/Process.php b/vendor/symfony/process/Symfony/Component/Process/Process.php
index e3686eee5..c49d7a56a 100755
--- a/vendor/symfony/process/Symfony/Component/Process/Process.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Process.php
@@ -55,7 +55,7 @@ class Process
     private $processInformation;
     private $stdout;
     private $stderr;
-    private $enhanceWindowsCompatibility;
+    private $enhanceWindowsCompatibility = true;
     private $enhanceSigchildCompatibility;
     private $process;
     private $status = self::STATUS_READY;
@@ -146,19 +146,16 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
         // on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
         // @see : https://bugs.php.net/bug.php?id=51800
         // @see : https://bugs.php.net/bug.php?id=50524
-
         if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || defined('PHP_WINDOWS_VERSION_BUILD'))) {
             $this->cwd = getcwd();
         }
         if (null !== $env) {
             $this->setEnv($env);
-        } else {
-            $this->env = null;
         }
+
         $this->stdin = $stdin;
         $this->setTimeout($timeout);
         $this->useFileHandles = defined('PHP_WINDOWS_VERSION_BUILD');
-        $this->enhanceWindowsCompatibility = true;
         $this->enhanceSigchildCompatibility = !defined('PHP_WINDOWS_VERSION_BUILD') && $this->isSigchildEnabled();
         $this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
     }
@@ -827,9 +824,15 @@ public function setIdleTimeout($timeout)
      * @param bool    $tty True to enabled and false to disable
      *
      * @return self The current Process instance
+     *
+     * @throws RuntimeException In case the TTY mode is not supported
      */
     public function setTty($tty)
     {
+        if (defined('PHP_WINDOWS_VERSION_BUILD') && $tty) {
+            throw new RuntimeException('TTY mode is not supported on Windows platform.');
+        }
+
         $this->tty = (bool) $tty;
 
         return $this;
@@ -929,9 +932,15 @@ public function getStdin()
      * @param string|null $stdin The new contents
      *
      * @return self The current Process instance
+     *
+     * @throws LogicException In case the process is running
      */
     public function setStdin($stdin)
     {
+        if ($this->isRunning()) {
+            throw new LogicException('STDIN can not be set while the process is running.');
+        }
+
         $this->stdin = $stdin;
 
         return $this;
@@ -1276,7 +1285,7 @@ private function doSignal($signal, $throwException)
     /**
      * Ensures the process is running or terminated, throws a LogicException if the process has a not started.
      *
-     * @param $functionName The function name that was called.
+     * @param string $functionName The function name that was called.
      *
      * @throws LogicException If the process has not run.
      */
@@ -1290,7 +1299,7 @@ private function requireProcessIsStarted($functionName)
     /**
      * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`.
      *
-     * @param $functionName The function name that was called.
+     * @param string $functionName The function name that was called.
      *
      * @throws LogicException If the process is not yet terminated.
      */
diff --git a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
index b6168feb6..c9a77d448 100755
--- a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
+++ b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
@@ -30,11 +30,23 @@ class ProcessBuilder
     private $inheritEnv = true;
     private $prefix = array();
 
+    /**
+     * Constructor
+     *
+     * @param string[] $arguments An array of arguments
+     */
     public function __construct(array $arguments = array())
     {
         $this->arguments = $arguments;
     }
 
+    /**
+     * Creates a process builder instance.
+     *
+     * @param string[] $arguments An array of arguments
+     *
+     * @return ProcessBuilder
+     */
     public static function create(array $arguments = array())
     {
         return new static($arguments);
@@ -71,7 +83,12 @@ public function setPrefix($prefix)
     }
 
     /**
-     * @param array $arguments
+     * Sets the arguments of the process.
+     *
+     * Arguments must not be escaped.
+     * Previous arguments are removed.
+     *
+     * @param string[] $arguments
      *
      * @return ProcessBuilder
      */
@@ -82,6 +99,13 @@ public function setArguments(array $arguments)
         return $this;
     }
 
+    /**
+     * Sets the working directory.
+     *
+     * @param null|string $cwd The working directory
+     *
+     * @return ProcessBuilder
+     */
     public function setWorkingDirectory($cwd)
     {
         $this->cwd = $cwd;
@@ -89,6 +113,13 @@ public function setWorkingDirectory($cwd)
         return $this;
     }
 
+    /**
+     * Sets whether environment variables will be inherited or not.
+     *
+     * @param bool $inheritEnv
+     *
+     * @return ProcessBuilder
+     */
     public function inheritEnvironmentVariables($inheritEnv = true)
     {
         $this->inheritEnv = $inheritEnv;
@@ -96,6 +127,17 @@ public function inheritEnvironmentVariables($inheritEnv = true)
         return $this;
     }
 
+    /**
+     * Sets an environment variable
+     *
+     * Setting a variable overrides its previous value. Use `null` to unset a
+     * defined environment variable.
+     *
+     * @param string      $name  The variable name
+     * @param null|string $value The variable value
+     *
+     * @return ProcessBuilder
+     */
     public function setEnv($name, $value)
     {
         $this->env[$name] = $value;
@@ -110,6 +152,13 @@ public function addEnvironmentVariables(array $variables)
         return $this;
     }
 
+    /**
+     * Sets the input of the process.
+     *
+     * @param string $stdin The input as a string
+     *
+     * @return ProcessBuilder
+     */
     public function setInput($stdin)
     {
         $this->stdin = $stdin;
@@ -147,6 +196,14 @@ public function setTimeout($timeout)
         return $this;
     }
 
+    /**
+     * Adds a proc_open option.
+     *
+     * @param string $name  The option name
+     * @param string $value The option value
+     *
+     * @return ProcessBuilder
+     */
     public function setOption($name, $value)
     {
         $this->options[$name] = $value;
@@ -154,6 +211,13 @@ public function setOption($name, $value)
         return $this;
     }
 
+    /**
+     * Creates a Process instance and returns it.
+     *
+     * @return Process
+     *
+     * @throws LogicException In case no arguments have been provided
+     */
     public function getProcess()
     {
         if (0 === count($this->prefix) && 0 === count($this->arguments)) {
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
index 62294aac3..9522bd402 100755
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Process\Tests;
 
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
+use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\Exception\RuntimeException;
 use Symfony\Component\Process\ProcessPipes;
@@ -157,6 +158,20 @@ public function testProcessPipes($code, $size)
         $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
     }
 
+    public function testSetStdinWhileRunningThrowsAnException()
+    {
+        $process = $this->getProcess('php -r "usleep(500000);"');
+        $process->start();
+        try {
+            $process->setStdin('foobar');
+            $process->stop();
+            $this->fail('A LogicException should have been raised.');
+        } catch (LogicException $e) {
+            $this->assertEquals('STDIN can not be set while the process is running.', $e->getMessage());
+        }
+        $process->stop();
+    }
+
     public function chainedCommandsOutputProvider()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
@@ -270,7 +285,7 @@ public function testTTYCommand()
         }
 
         $process = $this->getProcess('echo "foo" >> /dev/null && php -r "usleep(100000);"');
-        $process->setTTY(true);
+        $process->setTty(true);
         $process->start();
         $this->assertTrue($process->isRunning());
         $process->wait();
@@ -285,12 +300,24 @@ public function testTTYCommandExitCode()
         }
 
         $process = $this->getProcess('echo "foo" >> /dev/null');
-        $process->setTTY(true);
+        $process->setTty(true);
         $process->run();
 
         $this->assertTrue($process->isSuccessful());
     }
 
+    public function testTTYInWindowsEnvironment()
+    {
+        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->markTestSkipped('This test is for Windows platform only');
+        }
+
+        $process = $this->getProcess('echo "foo" >> /dev/null');
+        $process->setTty(false);
+        $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'TTY mode is not supported on Windows platform.');
+        $process->setTty(true);
+    }
+
     public function testExitCodeTextIsNullWhenExitCodeIsNull()
     {
         $process = $this->getProcess('');
diff --git a/vendor/symfony/routing/Symfony/Component/Routing/Annotation/Route.php b/vendor/symfony/routing/Symfony/Component/Routing/Annotation/Route.php
index ebda0971c..90521c0be 100755
--- a/vendor/symfony/routing/Symfony/Component/Routing/Annotation/Route.php
+++ b/vendor/symfony/routing/Symfony/Component/Routing/Annotation/Route.php
@@ -15,6 +15,7 @@
  * Annotation class for @Route().
  *
  * @Annotation
+ * @Target({"CLASS", "METHOD"})
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/vendor/symfony/security/Symfony/Component/Security/Acl/Tests/Voter/AclVoterTest.php b/vendor/symfony/security/Symfony/Component/Security/Acl/Tests/Voter/AclVoterTest.php
index 6bec23124..f13df1f0d 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Acl/Tests/Voter/AclVoterTest.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Acl/Tests/Voter/AclVoterTest.php
@@ -27,7 +27,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
      */
     public function testSupportsAttribute($attribute, $supported)
     {
-        list($voter,, $permissionMap,,) = $this->getVoter();
+        list($voter,, $permissionMap,,) = $this->getVoter(true, false);
 
         $permissionMap
             ->expects($this->once())
@@ -39,6 +39,16 @@ public function testSupportsAttribute($attribute, $supported)
         $this->assertSame($supported, $voter->supportsAttribute($attribute));
     }
 
+    /**
+     * @dataProvider getSupportsAttributeNonStringTests
+     */
+    public function testSupportsAttributeNonString($attribute)
+    {
+        list($voter,,,,,) = $this->getVoter(true, false);
+
+        $this->assertFalse($voter->supportsAttribute($attribute));
+    }
+
     public function getSupportsAttributeTests()
     {
         return array(
@@ -47,6 +57,16 @@ public function getSupportsAttributeTests()
         );
     }
 
+    public function getSupportsAttributeNonStringTests()
+    {
+        return array(
+            array(new \stdClass()),
+            array(1),
+            array(true),
+            array(array()),
+        );
+    }
+
     /**
      * @dataProvider getSupportsClassTests
      */
@@ -387,13 +407,20 @@ protected function getToken()
         return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
     }
 
-    protected function getVoter($allowIfObjectIdentityUnavailable = true)
+    protected function getVoter($allowIfObjectIdentityUnavailable = true, $alwaysContains = true)
     {
         $provider = $this->getMock('Symfony\Component\Security\Acl\Model\AclProviderInterface');
         $permissionMap = $this->getMock('Symfony\Component\Security\Acl\Permission\PermissionMapInterface');
         $oidStrategy = $this->getMock('Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface');
         $sidStrategy = $this->getMock('Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface');
 
+        if ($alwaysContains) {
+            $permissionMap
+                ->expects($this->any())
+                ->method('contains')
+                ->will($this->returnValue(true));
+        }
+
         return array(
             new AclVoter($provider, $oidStrategy, $sidStrategy, $permissionMap, null, $allowIfObjectIdentityUnavailable),
             $provider,
diff --git a/vendor/symfony/security/Symfony/Component/Security/Acl/Voter/AclVoter.php b/vendor/symfony/security/Symfony/Component/Security/Acl/Voter/AclVoter.php
index d401ef3be..b21b1e675 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Acl/Voter/AclVoter.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Acl/Voter/AclVoter.php
@@ -48,12 +48,16 @@ public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRet
 
     public function supportsAttribute($attribute)
     {
-        return $this->permissionMap->contains($attribute);
+        return is_string($attribute) && $this->permissionMap->contains($attribute);
     }
 
     public function vote(TokenInterface $token, $object, array $attributes)
     {
         foreach ($attributes as $attribute) {
+            if (!$this->supportsAttribute($attribute)) {
+                continue;
+            }
+
             if (null === $masks = $this->permissionMap->getMasks($attribute, $object)) {
                 continue;
             }
diff --git a/vendor/symfony/security/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php b/vendor/symfony/security/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
index 76c4b3b57..aee4cdad2 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
@@ -15,6 +15,7 @@
 
 /**
  * @Annotation
+ * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 class UserPassword extends Constraint
 {
diff --git a/vendor/symfony/security/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php b/vendor/symfony/security/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php
index 4d81da9c4..e02ac66ea 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php
@@ -12,19 +12,7 @@
 namespace Symfony\Component\Security\Csrf\TokenGenerator;
 
 /**
- * Generates and validates CSRF tokens.
- *
- * You can generate a CSRF token by using the method {@link generateCsrfToken()}.
- * This method expects a unique token ID as argument. The token ID can later be
- * used to validate a token provided by the user.
- *
- * Token IDs do not necessarily have to be secret, but they should NEVER be
- * created from data provided by the client. A good practice is to hard-code the
- * token IDs for the various CSRF tokens used by your application.
- *
- * You should use the method {@link isCsrfTokenValid()} to check a CSRF token
- * submitted by the client. This method will return true if the CSRF token is
- * valid.
+ * Generates CSRF tokens.
  *
  * @since  2.4
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
index f97cd59cd..20ce4f265 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
@@ -56,7 +56,7 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
      * @throws \InvalidArgumentException In case no simple authenticator is provided
      * @throws InvalidArgumentException  In case an invalid CSRF token manager is passed
      */
-    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, CsrfTokenManagerInterface $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
+    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
     {
         if (!$simpleAuthenticator) {
             throw new \InvalidArgumentException('Missing simple authenticator');
diff --git a/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
index 5aabf75fc..9c07be123 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
@@ -41,10 +41,17 @@ public function __construct(SecurityContextInterface $securityContext, Authentic
      */
     protected function getPreAuthenticatedData(Request $request)
     {
-        if (!$request->server->has($this->userKey)) {
-            throw new BadCredentialsException(sprintf('SSL key was not found: %s', $this->userKey));
+        $user = null;
+        if ($request->server->has($this->userKey)) {
+            $user = $request->server->get($this->userKey);
+        } elseif ($request->server->has($this->credentialKey) && preg_match('#/emailAddress=(.+\@.+\..+)(/|$)#', $request->server->get($this->credentialKey), $matches)) {
+            $user = $matches[1];
         }
 
-        return array($request->server->get($this->userKey), $request->server->get($this->credentialKey, ''));
+        if (null === $user) {
+            throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s', $this->userKey, $this->credentialKey));
+        }
+
+        return array($user, $request->server->get($this->credentialKey, ''));
     }
 }
diff --git a/vendor/symfony/security/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/vendor/symfony/security/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
index 7725f4bea..7eefb3096 100755
--- a/vendor/symfony/security/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/vendor/symfony/security/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -35,11 +35,7 @@ public function testGetPreAuthenticatedData($user, $credentials)
 
         $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
 
-        $listener = new X509AuthenticationListener(
-            $context,
-            $authenticationManager,
-            'TheProviderKey'
-        );
+        $listener = new X509AuthenticationListener($context, $authenticationManager, 'TheProviderKey');
 
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
@@ -56,10 +52,39 @@ public static function dataProviderGetPreAuthenticatedData()
         );
     }
 
+    /**
+     * @dataProvider dataProviderGetPreAuthenticatedDataNoUser
+     */
+    public function testGetPreAuthenticatedDataNoUser($emailAddress)
+    {
+        $credentials = 'CN=Sample certificate DN/emailAddress='.$emailAddress;
+        $request = new Request(array(), array(), array(), array(), array(), array('SSL_CLIENT_S_DN' => $credentials));
+
+        $context = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
+
+        $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+
+        $listener = new X509AuthenticationListener($context, $authenticationManager, 'TheProviderKey');
+
+        $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
+        $method->setAccessible(true);
+
+        $result = $method->invokeArgs($listener, array($request));
+        $this->assertSame($result, array($emailAddress, $credentials));
+    }
+
+    public static function dataProviderGetPreAuthenticatedDataNoUser()
+    {
+        return array(
+            'basicEmailAddress' => array('cert@example.com'),
+            'emailAddressWithPlusSign' => array('cert+something@example.com'),
+        );
+    }
+
     /**
      * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
      */
-    public function testGetPreAuthenticatedDataNoUser()
+    public function testGetPreAuthenticatedDataNoData()
     {
         $request = new Request(array(), array(), array(), array(), array(), array());
 
@@ -67,11 +92,7 @@ public function testGetPreAuthenticatedDataNoUser()
 
         $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
 
-        $listener = new X509AuthenticationListener(
-            $context,
-            $authenticationManager,
-            'TheProviderKey'
-        );
+        $listener = new X509AuthenticationListener($context, $authenticationManager, 'TheProviderKey');
 
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
@@ -91,13 +112,7 @@ public function testGetPreAuthenticatedDataWithDifferentKeys()
 
         $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
 
-        $listener = new X509AuthenticationListener(
-            $context,
-            $authenticationManager,
-            'TheProviderKey',
-            'TheUserKey',
-            'TheCredentialsKey'
-        );
+        $listener = new X509AuthenticationListener($context, $authenticationManager, 'TheProviderKey', 'TheUserKey', 'TheCredentialsKey');
 
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php b/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php
index 73f7f0236..8ba96680a 100755
--- a/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -157,7 +157,7 @@ private function parse($resource)
     private function addMessage(array &$messages, array $item)
     {
         if (is_array($item['translated'])) {
-            $messages[$item['ids']['singular']] = stripslashes($item['translated'][0]);
+            $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]);
             if (isset($item['ids']['plural'])) {
                 $plurals = $item['translated'];
                 // PO are by definition indexed so sort by index.
@@ -172,7 +172,7 @@ private function addMessage(array &$messages, array $item)
                 $messages[$item['ids']['plural']] = stripcslashes(implode('|', $plurals));
             }
         } elseif (!empty($item['ids']['singular'])) {
-              $messages[$item['ids']['singular']] = stripslashes($item['translated']);
+              $messages[$item['ids']['singular']] = stripcslashes($item['translated']);
         }
     }
 }
diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php b/vendor/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
index 7d969ce27..cb30c6661 100755
--- a/vendor/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
+++ b/vendor/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
@@ -18,7 +18,7 @@ class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase
 {
     public function testDump()
     {
-        if (!extension_loaded('mbstring')) {
+        if (!function_exists('mb_convert_encoding')) {
             $this->markTestSkipped('This test requires mbstring to work.');
         }