Skip to content
This repository was archived by the owner on Feb 9, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Classes/Library/PageLoader/Coordinators/Navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace App\Classes\Library\PageLoader\Coordinators;

use App\Classes\Breadcrumbs;
use App\Model\Menu;
use App\Model\Page;
use App\Classes\Breadcrumbs;
use Illuminate\Support\Collection;

/**
Expand Down
10 changes: 5 additions & 5 deletions app/Model/Menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace App\Model;

use Carbon\Carbon;
use Laravel\Scout\Searchable;
use App\Classes\Interfaces\Linker;
use App\Model\Concerns\ActivityFeed;
use App\Model\Concerns\Publishers;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Relations\MorphOne;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Laravel\Scout\Searchable;
use App\Model\Concerns\ActivityFeed;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Relations\MorphOne;

/**
* Class Menus.
Expand Down
4 changes: 2 additions & 2 deletions database/factories/UserFactory.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use Faker\Generator as Faker;
use App\Classes\Roles\Administrator;
use App\Modules\Pages\Model\PageOptions;
use App\Modules\Pages\Model\PageTypes;
use Faker\Generator as Faker;
use App\Modules\Pages\Model\PageOptions;

/*
|--------------------------------------------------------------------------
Expand Down
11 changes: 4 additions & 7 deletions tests/Common/NavigationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
use App\Model\Menu;

/**
* Class NavigationTest
*
* @package Tests
* Class NavigationTest.
*/
class NavigationTest extends TestCase
{
Expand All @@ -33,9 +31,8 @@ public function a_navigations_submenus_are_ordered()
$submenu2 = factory(Menu::class)->create(['order' => 1, 'title' => 'submenu2', 'parent_id' => $parent]);

// Menus should be returned based on its order from the relationship query.
foreach ($parent->children as $index => $submenu)
{
$this->assertEquals($index+1, $submenu->order);
foreach ($parent->children as $index => $submenu) {
$this->assertEquals($index + 1, $submenu->order);
}
}
}
}