From fae2aa4582d1a1268827c4638e7bb375be46f73d Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Fri, 20 Apr 2018 11:18:01 +0300
Subject: [PATCH] Added compatibility mode to fall back to Symfony YAML 2.8
 when needed

---
 CHANGELOG.md  |  2 +-
 composer.json |  6 +++++-
 composer.lock | 40 ++++++++++++++++++++++------------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b233f0f32..888ed071a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 1. [](#new)
     * Set minimum requirements to [PHP 5.6.4](https://getgrav.org/blog/raising-php-requirements-2018)
     * Updated Doctrine Collections to 1.4
-    * Updated Symfony Components to 3.4, causing some compatibility issues with YAML files
+    * Updated Symfony Components to 3.4 (with compatibility mode to fall back to Symfony YAML 2.8)
 
 # v1.4.4
 ## 04/12/2018
diff --git a/composer.json b/composer.json
index 890caec84..869b34b85 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "gregwar/image": "2.*",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "~1.3",
+        "rockettheme/toolbox": "dev-feature/grav15",
         "maximebf/debugbar": "~1.10",
         "ext-mbstring": "*",
         "ext-openssl": "*",
@@ -52,6 +52,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/rockettheme/toolbox"
         }
     ],
     "autoload": {
diff --git a/composer.lock b/composer.lock
index 0b6605664..7929fc0a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e3d08425a81cf7c482391f4580b52cd5",
+    "content-hash": "84bdd0ec9d5acca4bae5a50d4484cd3e",
     "packages": [
         {
             "name": "antoligy/dom-string-iterators",
@@ -657,16 +657,16 @@
         },
         {
             "name": "matthiasmullie/minify",
-            "version": "1.3.59",
+            "version": "1.3.60",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "62dac3bce06de66f0d71fe6490cf1c508d3c3ff7"
+                "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/62dac3bce06de66f0d71fe6490cf1c508d3c3ff7",
-                "reference": "62dac3bce06de66f0d71fe6490cf1c508d3c3ff7",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/ab7fea80ce5ce6549baaf272bc8bd926a7e08f90",
+                "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90",
                 "shasum": ""
             },
             "require": {
@@ -713,7 +713,7 @@
                 "minifier",
                 "minify"
             ],
-            "time": "2018-02-02T12:44:18+00:00"
+            "time": "2018-04-18T08:50:35+00:00"
         },
         {
             "name": "matthiasmullie/path-converter",
@@ -1204,16 +1204,16 @@
         },
         {
             "name": "rockettheme/toolbox",
-            "version": "1.3.9",
+            "version": "dev-feature/grav15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "1deea4b45e09f6e0c3e6e075e175e50d05ccbf70"
+                "reference": "9434fb837b84fbb088b1cbcfbe482b6543c28450"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/1deea4b45e09f6e0c3e6e075e175e50d05ccbf70",
-                "reference": "1deea4b45e09f6e0c3e6e075e175e50d05ccbf70",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/9434fb837b84fbb088b1cbcfbe482b6543c28450",
+                "reference": "9434fb837b84fbb088b1cbcfbe482b6543c28450",
                 "shasum": ""
             },
             "require": {
@@ -1238,7 +1238,6 @@
                     "RocketTheme\\Toolbox\\StreamWrapper\\": "StreamWrapper/src"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1248,7 +1247,11 @@
                 "php",
                 "rockettheme"
             ],
-            "time": "2018-03-09T00:03:18+00:00"
+            "support": {
+                "source": "https://github.com/rockettheme/toolbox/tree/feature/grav15",
+                "issues": "https://github.com/rockettheme/toolbox/issues"
+            },
+            "time": "2018-04-20T08:06:27+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -2450,23 +2453,23 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.7.5",
+            "version": "1.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
@@ -2509,7 +2512,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-02-19T10:16:54+00:00"
+            "time": "2018-04-18T13:57:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3623,6 +3626,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "rockettheme/toolbox": 20,
         "victorjonsson/markdowndocs": 20
     },
     "prefer-stable": false,