Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding Laravel 5.6 support #2

Merged
merged 1 commit into from
Feb 6, 2019
Merged

Adding Laravel 5.6 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: php
sudo: false

php:
- 7.0
- 7.1.3
- 7.1
- 7.2
- 7.3
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 1 addition & 2 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
>
<testsuites>
<testsuite name="Application Test Suite">
Expand All @@ -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>
2 changes: 1 addition & 1 deletion src/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down