Merge pull request #164 from troccoli/upgrade-to-laravel-8

Upgraded to Laravel 8
troccoli · Jul 13, 2021 · 65878ef · 65878ef
2 parents 16d61ab + 386e418
commit 65878ef
Show file tree

Hide file tree

Showing 155 changed files with 14,099 additions and 14,748 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,7 +37,7 @@ jobs:
             - composer-v2-
       - run:
           name: Install Composer Dependencies
-          command: composer install -n --ignore-platform-reqs --no-progress --no-suggest
+          command: composer install -n --ignore-platform-reqs --no-progress
       - save_cache:
           key: composer-v2-{{ checksum "composer.lock" }}
           paths:
@@ -72,7 +72,7 @@ jobs:
 
       - run:
           name: Run Unit Tests
-          command: vendor/bin/phpunit --printer PHPUnit\\TextUI\\ResultPrinter
+          command: vendor/bin/phpunit
 
       - run:
           name: Update Chrome Driver

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,7 +100,7 @@ jobs:
       - name: Dump Autoloader
         run: composer dump-autoload
       - name: Execute Unit tests via PHPUnit
-        run: vendor/bin/phpunit tests/Unit --printer PHPUnit\\TextUI\\ResultPrinter
+        run: vendor/bin/phpunit tests/Unit
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         if: failure()
@@ -148,7 +148,7 @@ jobs:
       - name: Run Laravel Server
         run: php artisan serve &
       - name: Execute Integration tests via PHPUnit
-        run: vendor/bin/phpunit tests/Integration --printer PHPUnit\\TextUI\\ResultPrinter
+        run: vendor/bin/phpunit tests/Integration
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         if: failure()
@@ -201,7 +201,7 @@ jobs:
       - name: Run Laravel Server
         run: php artisan serve &
       - name: Execute Feature tests via PHPUnit
-        run: vendor/bin/phpunit tests/Feature --printer PHPUnit\\TextUI\\ResultPrinter
+        run: vendor/bin/phpunit tests/Feature
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         if: failure()

diff --git a/.styleci.yml b/.styleci.yml
@@ -1 +1 @@
-preset: psr2
+preset: laravel
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ branches:
 
 install:
   - cp .env.ci .env
-  - travis_retry composer install -n --ignore-platform-reqs --no-progress --no-suggest
+  - travis_retry composer install -n --ignore-platform-reqs --no-progress
   - npm install
   - npm run production
 
@@ -30,7 +30,7 @@ before_script:
   - php artisan serve &
 
 script:
-  - vendor/bin/phpunit --printer PHPUnit\\TextUI\\ResultPrinter
+  - vendor/bin/phpunit
   - php artisan dusk
 
 notifications:

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {

diff --git a/app/Helpers/PermissionsHelper.php b/app/Helpers/PermissionsHelper.php
@@ -12,7 +12,7 @@ final class PermissionsHelper
 {
     final public static function addSeason(): string
     {
-        return "add-season";
+        return 'add-season';
     }
 
     final public static function viewSeason(Season $season): string
@@ -92,7 +92,7 @@ final public static function deleteFixtures(Division $division): string
 
     final public static function addClub(): string
     {
-        return "add-club";
+        return 'add-club';
     }
 
     final public static function viewClub(Club $club): string

diff --git a/app/Helpers/RolesHelper.php b/app/Helpers/RolesHelper.php
@@ -28,7 +28,7 @@ final public static function seasonAdmin(Season $season): string
 
     final public static function isSeasonAdmin(Role $role): bool
     {
-        return (bool)preg_match(self::buildPattern(self::SEASON_ADMIN_TEMPLATE), $role->name);
+        return (bool) preg_match(self::buildPattern(self::SEASON_ADMIN_TEMPLATE), $role->name);
     }
 
     final public static function findSeason(Role $role): ?Season
@@ -47,7 +47,7 @@ final public static function competitionAdmin(Competition $competition): string
 
     final public static function isCompetitionAdmin(Role $role): bool
     {
-        return (bool)preg_match(self::buildPattern(self::COMPETITION_ADMIN_TEMPLATE), $role->name);
+        return (bool) preg_match(self::buildPattern(self::COMPETITION_ADMIN_TEMPLATE), $role->name);
     }
 
     final public static function findCompetition(Role $role): ?Competition
@@ -66,7 +66,7 @@ final public static function divisionAdmin(Division $competition): string
 
     final public static function isDivisionAdmin(Role $role): bool
     {
-        return (bool)preg_match(self::buildPattern(self::DIVISION_ADMIN_TEMPLATE), $role->name);
+        return (bool) preg_match(self::buildPattern(self::DIVISION_ADMIN_TEMPLATE), $role->name);
     }
 
     final public static function findDivision(Role $role): ?Division
@@ -85,7 +85,7 @@ final public static function clubSecretary(Club $club): string
 
     final public static function isClubSecretary(Role $role): bool
     {
-        return (bool)preg_match(self::buildPattern(self::CLUB_SECRETARY_TEMPLATE), $role->name);
+        return (bool) preg_match(self::buildPattern(self::CLUB_SECRETARY_TEMPLATE), $role->name);
     }
 
     final public static function findClub(Role $role): ?Club
@@ -104,7 +104,7 @@ final public static function teamSecretary(Team $team): string
 
     final public static function isTeamSecretary(Role $role): bool
     {
-        return (bool)preg_match(self::buildPattern(self::TEAM_SECRETARY_TEMPLATE), $role->name);
+        return (bool) preg_match(self::buildPattern(self::TEAM_SECRETARY_TEMPLATE), $role->name);
     }
 
     final public static function findTeam(Role $role): ?Team
@@ -118,6 +118,6 @@ final public static function findTeam(Role $role): ?Team
 
     final private static function buildPattern(string $template): string
     {
-        return '/^' . Str::replaceFirst('%s', '(\d+)', $template) . '$/';
+        return '/^'.Str::replaceFirst('%s', '(\d+)', $template).'$/';
     }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Models\User;
 use App\Http\Controllers\Controller;
+use App\Models\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
 {

diff --git a/app/Http/Controllers/ClubController.php b/app/Http/Controllers/ClubController.php
@@ -33,7 +33,7 @@ public function store(Request $request): RedirectResponse
             $request,
             [
                 'name' => 'required|unique:clubs',
-                'venue_id' => 'present|nullable|exists:venues,id'
+                'venue_id' => 'present|nullable|exists:venues,id',
             ],
             [
                 'name.required' => __('The name is required.'),
@@ -60,7 +60,7 @@ public function update(Request $request, Club $club): RedirectResponse
         $this->validate(
             $request,
             [
-                'name' => 'required|unique:clubs,name,' . $club->getId(),
+                'name' => 'required|unique:clubs,name,'.$club->getId(),
                 'venue_id' => 'present|nullable|exists:venues,id',
             ],
             [

diff --git a/app/Http/Controllers/CompetitionController.php b/app/Http/Controllers/CompetitionController.php
@@ -7,7 +7,6 @@
 use Illuminate\Database\Query\Builder;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
 use Illuminate\View\View;
 

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {

diff --git a/app/Http/Controllers/SeasonController.php b/app/Http/Controllers/SeasonController.php
@@ -40,7 +40,7 @@ public function store(Request $request): RedirectResponse
 
         Season::create($request->only('year'));
 
-        return redirect()->route('seasons.index') ->withToastSuccess(__('Season added!'));
+        return redirect()->route('seasons.index')->withToastSuccess(__('Season added!'));
     }
 
     public function edit(Season $season): View
@@ -53,7 +53,7 @@ public function update(Request $request, Season $season): RedirectResponse
         $this->validate(
             $request,
             [
-                'year' => 'required|integer|unique:seasons,year,' . $season->getId(),
+                'year' => 'required|integer|unique:seasons,year,'.$season->getId(),
             ],
             [
                 'year.required' => __('The year is required.'),

diff --git a/app/Http/Controllers/TeamController.php b/app/Http/Controllers/TeamController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Team;
 use App\Models\Club;
+use App\Models\Team;
 use App\Models\Venue;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Http\RedirectResponse;
@@ -45,7 +45,7 @@ public function store(Request $request, Club $club): RedirectResponse
                         return $query->where('club_id', $club->getId());
                     }),
                 ],
-                'venue_id' => 'present|nullable|exists:venues,id'
+                'venue_id' => 'present|nullable|exists:venues,id',
             ],
             [
                 'name.required' => __('The name is required.'),

diff --git a/app/Http/Controllers/VenueController.php b/app/Http/Controllers/VenueController.php
@@ -57,7 +57,7 @@ public function update(Request $request, Venue $venue): RedirectResponse
         $this->validate(
             $request,
             [
-                'name' => 'required|unique:venues,name,' . $venue->getId(),
+                'name' => 'required|unique:venues,name,'.$venue->getId(),
             ],
             [
                 'name.required' => __('The name is required.'),

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {

diff --git a/app/Http/Resources/TeamResource.php b/app/Http/Resources/TeamResource.php
@@ -5,7 +5,6 @@
 use App\Http\Controllers\Api\V1\LoadRelations;
 use App\Models\Team;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Http\Resources\MissingValue;
 
 class TeamResource extends JsonResource
 {

diff --git a/app/Models/Club.php b/app/Models/Club.php
@@ -4,13 +4,16 @@
 
 use App\Events\ClubCreated;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 
 class Club extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['name', 'venue_id'];
 
     protected $dispatchesEvents = [
@@ -42,12 +45,12 @@ public function venue(): BelongsTo
         return $this->belongsTo(Venue::class);
     }
 
-    public function getVenue():? Venue
+    public function getVenue(): ?Venue
     {
         return $this->venue;
     }
 
-    public function getVenueId():? string
+    public function getVenueId(): ?string
     {
         return $this->venue_id;
     }

diff --git a/app/Models/Competition.php b/app/Models/Competition.php
@@ -5,13 +5,16 @@
 use App\Events\CompetitionCreated;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 class Competition extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['season_id', 'name'];
 
     protected $dispatchesEvents = [

diff --git a/app/Models/Division.php b/app/Models/Division.php
@@ -3,9 +3,9 @@
 namespace App\Models;
 
 use App\Events\DivisionCreated;
-use App\Events\SeasonCreated;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -14,6 +14,7 @@
 
 class Division extends Model
 {
+    use HasFactory;
     use SoftDeletes;
 
     protected $fillable = ['competition_id', 'name', 'display_order'];

diff --git a/app/Models/Fixture.php b/app/Models/Fixture.php
@@ -4,14 +4,15 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Fixture extends Model
 {
+    use HasFactory;
     use SoftDeletes;
 
     protected $guarded = ['id', 'created_at', 'updated_at', 'deleted_at'];

diff --git a/app/Models/Season.php b/app/Models/Season.php
@@ -5,12 +5,15 @@
 use App\Events\SeasonCreated;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 
 class Season extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['year'];
 
     protected $dispatchesEvents = [