From 3d73f3877a7c471aa2754b3553bcfa3c73d31aa2 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <udan1107@gmail.com>
Date: Wed, 21 Oct 2015 23:13:23 +0300
Subject: [PATCH] Fix error message.

---
 src/Components/OptionsArray.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
index a68df8ec6..42f0762ab 100644
--- a/src/Components/OptionsArray.php
+++ b/src/Components/OptionsArray.php
@@ -145,7 +145,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         $parser->error(
                             sprintf(
                                 __('This option conflicts with "%1$s".'),
-                                $ret->options[$lastOptionId]
+                                is_array($ret->options[$lastOptionId])
+                                    ? $ret->options[$lastOptionId]['name']
+                                    : $ret->options[$lastOptionId]
                             ),
                             $token
                         );