Skip to content
This repository has been archived by the owner on Jun 28, 2023. It is now read-only.

Apply fixes from StyleCI #16

Merged
merged 1 commit into from
Jan 20, 2017
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
9 changes: 9 additions & 0 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App\Console;

use Illuminate\Console\Scheduling\Schedule;
Expand Down
6 changes: 3 additions & 3 deletions app/Exceptions/Displayers/JsonValidationDisplayer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

namespace App\Exceptions\Displayers;

use App\Exceptions\ValidationException;
use Exception;
use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
use GrahamCampbell\Exceptions\Displayers\JsonApiDisplayer;
use Illuminate\Http\JsonResponse;
use App\Exceptions\ValidationException;
use GrahamCampbell\Exceptions\Displayers\JsonApiDisplayer;
use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;

class JsonValidationDisplayer extends JsonApiDisplayer implements DisplayerInterface
{
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Transformers/AuthTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
namespace App\Exceptions\Transformers;

use Exception;
use GrahamCampbell\Exceptions\Transformers\TransformerInterface;
use Illuminate\Auth\AuthenticationException;
use GrahamCampbell\Exceptions\Transformers\TransformerInterface;
use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;

class AuthTransformer implements TransformerInterface
Expand Down
2 changes: 1 addition & 1 deletion app/Guards/LegacyTokenGuard.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of solder.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Api/LegacyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use App\Build;
use App\Token;
use App\Modpack;
use App\Resource;
use App\Version;
use App\Resource;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

Expand Down Expand Up @@ -186,7 +186,7 @@ private function transformBuild(Build $build)
/**
* Transform the Modpack entity.
*
* @param Resource $mod
* @param resource $mod
*
* @return array
*/
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Api/ModpackBuildsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
namespace App\Http\Controllers\Api;

use Auth;
use App\Privacy;
use App\Modpack;
use App\Privacy;
use Illuminate\Http\Request;
use App\Traits\ImplementsApi;
use App\Transformers\BuildTransformer;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Api/ModpacksController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use Auth;
use Storage;
use Exception;
use App\Privacy;
use App\Modpack;
use App\Privacy;
use Illuminate\Http\Request;
use App\Traits\ImplementsApi;
use League\Fractal\TransformerAbstract;
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Api/ResourceVersionsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ResourceVersionsController extends ApiController
*
* @param Request $request
*
* @param Resource $resource
* @param resource $resource
*
* @return \Illuminate\Http\JsonResponse
* @throws AuthenticationException
Expand All @@ -43,7 +43,7 @@ public function index(Request $request, Resource $resource)
/**
* Display relationship data.
*
* @param Resource $resource
* @param resource $resource
*
* @return \Illuminate\Http\JsonResponse
*
Expand All @@ -65,7 +65,7 @@ public function show(Resource $resource)
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param Resource $resource
* @param resource $resource
*
* @return Response
*/
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Api/ResourcesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function index(Request $request)
* Display the specified resource.
*
* @param Request $request
* @param Resource $resource
* @param resource $resource
*
* @return \Illuminate\Http\JsonResponse
*/
Expand Down Expand Up @@ -93,7 +93,7 @@ public function store(Request $request)
* Update the specified resource in storage.
*
* @param Request $request
* @param Resource $resource
* @param resource $resource
*
* @return \Illuminate\Http\JsonResponse
*/
Expand All @@ -117,7 +117,7 @@ public function update(Request $request, Resource $resource)
/**
* Remove the specified resource from storage.
*
* @param Resource $resource
* @param resource $resource
*
* @return \Illuminate\Http\Response
*/
Expand Down
9 changes: 9 additions & 0 deletions app/Http/Controllers/Auth/ForgotPasswordController.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
Expand Down
9 changes: 9 additions & 0 deletions app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
Expand Down
9 changes: 9 additions & 0 deletions app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App\Http\Controllers\Auth;

use App\User;
Expand Down
9 changes: 9 additions & 0 deletions app/Http/Controllers/Auth/ResetPasswordController.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
Expand Down
4 changes: 2 additions & 2 deletions app/Providers/AuthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

namespace App\Providers;

use App\Guards\LegacyTokenGuard;
use Auth;
use Illuminate\Auth\CreatesUserProviders;
use Laravel\Passport\Passport;
use App\Guards\LegacyTokenGuard;
use Illuminate\Auth\CreatesUserProviders;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;

class AuthServiceProvider extends ServiceProvider
Expand Down
4 changes: 2 additions & 2 deletions app/Resource.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

namespace App;

use Alsofronie\Uuid\UuidModelTrait;
use Illuminate\Database\Eloquent\Model;
use Spatie\Sluggable\HasSlug;
use Spatie\Sluggable\SlugOptions;
use Alsofronie\Uuid\UuidModelTrait;
use Illuminate\Database\Eloquent\Model;

/**
* App\Resource.
Expand Down
3 changes: 2 additions & 1 deletion app/Serializers/JsonApiRelationships.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

/*
* This file is part of solder.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand Down
9 changes: 9 additions & 0 deletions app/Token.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App;

use Illuminate\Database\Eloquent\Model;
Expand Down
3 changes: 2 additions & 1 deletion app/Traits/ImplementsApi.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

/*
* This file is part of solder.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand Down
2 changes: 1 addition & 1 deletion app/Transformers/ModpackTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace App\Transformers;

use App\Modpack;
use Auth;
use App\Modpack;
use League\Fractal\TransformerAbstract;

class ModpackTransformer extends TransformerAbstract
Expand Down
4 changes: 2 additions & 2 deletions app/Transformers/ResourceTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ResourceTransformer extends TransformerAbstract
/**
* Transform the Resource entity.
*
* @param Resource $resource
* @param resource $resource
*
* @return array
*/
Expand All @@ -49,7 +49,7 @@ public function transform(Resource $resource)
/**
* Include Versions.
*
* @param Resource $resource
* @param resource $resource
*
* @return \League\Fractal\Resource\Collection
*/
Expand Down
16 changes: 7 additions & 9 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?php

/*
|--------------------------------------------------------------------------
| Create The Application
|--------------------------------------------------------------------------
|
| The first thing we will do is create a new Laravel application instance
| which serves as the "glue" for all the components of Laravel, and is
| the IoC container for the system binding all of the various parts.
|
*/
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

$app = new Illuminate\Foundation\Application(
realpath(__DIR__.'/../')
Expand Down
9 changes: 9 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

return [

/*
Expand Down
9 changes: 9 additions & 0 deletions config/database.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

return [

/*
Expand Down
7 changes: 3 additions & 4 deletions database/factories/AssetFactory.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Solder Framework.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand All @@ -10,15 +10,14 @@
*/

/** @var \Illuminate\Database\Eloquent\Factory $factory */

use App\Asset;
use App\Version;

$factory->define(Asset::class, function (Faker\Generator $faker) {
return [
'filename' => 'testfile.txt',
'version_id' => function() {
'version_id' => function () {
return factory(Version::class)->create()->id;
}
},
];
});
4 changes: 2 additions & 2 deletions database/factories/BuildFactory.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Solder Framework.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand All @@ -18,7 +18,7 @@
return [
'version' => '1.0.0',
'game_version' => '1.0.0',
'modpack_id' => function() {
'modpack_id' => function () {
return factory(Modpack::class)->create()->id;
},
];
Expand Down
2 changes: 1 addition & 1 deletion database/factories/ModpackFactory.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Solder Framework.
* This file is part of TechnicSolder.
*
* (c) Kyle Klaus <kklaus@indemnity83.com>
*
Expand Down
Loading