From 16f433610cbf4e44c28a5fd5d99d8af1b125a11b Mon Sep 17 00:00:00 2001
From: ARCANEDEV <arcanedev.maroc@gmail.com>
Date: Wed, 6 Feb 2019 11:43:56 +0100
Subject: [PATCH] Adding Laravel 5.6 support

---
 .travis.yml      |  2 +-
 composer.json    | 12 ++++++------
 phpunit.xml.dist |  3 +--
 src/Manager.php  |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1865a56..0aea093 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: php
 sudo: false
 
 php:
-  - 7.0
+  - 7.1.3
   - 7.1
   - 7.2
   - 7.3
diff --git a/composer.json b/composer.json
index 6cfc4ab..0bd3095 100644
--- a/composer.json
+++ b/composer.json
@@ -14,15 +14,15 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                  ">=7.0",
-        "arcanedev/support":    "~4.2.0",
+        "php":                  ">=7.1.3",
+        "arcanedev/support":    "~4.3.0",
         "arcanesoft/contracts": "~2.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit":     "~6.0",
-        "phpunit/phpcov":      "~4.0",
-        "symfony/dom-crawler": "~3.3.0",
-        "orchestra/testbench": "~3.5.0"
+        "phpunit/phpunit":     "~7.0",
+        "phpunit/phpcov":      "~5.0",
+        "symfony/dom-crawler": "~3.4.0",
+        "orchestra/testbench": "~3.6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f7b46b1..1f34536 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
         >
     <testsuites>
         <testsuite name="Application Test Suite">
@@ -26,6 +25,6 @@
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
         <log type="coverage-text" target="build/logs/coverage.txt"/>
-        <log type="coverage-html" target="build/logs/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/logs/coverage"/>
     </logging>
 </phpunit>
diff --git a/src/Manager.php b/src/Manager.php
index 9802bb8..2ec8d67 100644
--- a/src/Manager.php
+++ b/src/Manager.php
@@ -197,7 +197,7 @@ public function loadItemsFromConfig($key)
      */
     public function render($view = null, array $data = [])
     {
-        $this->syncCurrentName()->setView(is_null($view) ? '_includes.sidebar.default' : $view);
+        $this->syncCurrentName()->setView($view ?: '_includes.sidebar.default');
 
         return new HtmlString(
             view($this->view, array_merge($data, ['sidebarItems' => $this->getItems()]))->render()