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
8 changes: 4 additions & 4 deletions app/Model/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

namespace App\Model;

use App\Classes\Roles\Exceptions\InvalidRoleType;
use App\Classes\Roles\Interfaces\RoleInterface;
use App\Model\Concerns\ActivityFeed;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Relations\HasMany;
use App\Model\Concerns\ActivityFeed;
use Illuminate\Database\Eloquent\SoftDeletes;
use App\Classes\Roles\Interfaces\RoleInterface;
use App\Classes\Roles\Exceptions\InvalidRoleType;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\User as Authenticatable;

/**
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreateActivityModifierInterface extends Migration
{
Expand Down
4 changes: 2 additions & 2 deletions database/migrations/2017_12_11_232909_organise_menu_table.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use App\Model\Menu;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class OrganiseMenuTable extends Migration
{
Expand Down
5 changes: 2 additions & 3 deletions database/migrations/2018_02_25_004151_february_update_one.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use App\Model\Categories;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class FebruaryUpdateOne extends Migration
{
Expand Down Expand Up @@ -33,7 +33,6 @@ public function up()
$table->timestamps();
});


Categories::create(['slug' => 'general', 'title' => 'General', 'status' => true, 'editor_id' => 1, 'creator_id' => 1]);

Schema::create('articles', function (Blueprint $table) {
Expand Down
4 changes: 2 additions & 2 deletions database/migrations/2018_05_07_174354_may_update_one.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class MayUpdateOne extends Migration
{
Expand Down
6 changes: 3 additions & 3 deletions database/migrations/2018_06_03_001436_june_update_one.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

use App\Model\Page;
use App\Modules\Pages\Model\PageOptions;
use App\Modules\Pages\Model\PageTypes;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use App\Modules\Pages\Model\PageOptions;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class JuneUpdateOne extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreateAccessLogTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

use App\Model\Role;
use App\Model\Account;
use App\Classes\Roles\Developer;
use App\Classes\StringGenerator;
use App\Model\Account;
use App\Model\Role;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreateSystemRolesAndPermissions extends Migration
{
Expand Down Expand Up @@ -76,7 +76,6 @@ public function up()
$table->string('username')->after('id')->default(str_slug(Faker\Factory::create()->userName));
});


foreach (Account::all() as $account) {
$account->update(['username' => StringGenerator::stripEmail($account->email)]);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Article/ArticleFrontendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace Tests\Article;

use Carbon\Carbon;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Foundation\Testing\RefreshDatabase;

class ArticleFrontendTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Config/ConfigFormTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Tests\Feature;

use Tests\TestCase;
use App\Model\Configuration;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithoutMiddleware;
use Tests\TestCase;

/**
* Class ConfigTest.
Expand Down
5 changes: 2 additions & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

namespace Tests;

use Mockery;
use App\Exceptions\Handler;
use Illuminate\Contracts\Debug\ExceptionHandler;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Contracts\Debug\ExceptionHandler;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
use Mockery;

abstract class TestCase extends BaseTestCase
{
use CreatesApplication;

use RefreshDatabase;

protected function setUp()
Expand Down