Merge pull request #166 from troccoli/install-sail

Install sail
troccoli · Jul 13, 2021 · dfbf868 · dfbf868
2 parents 65878ef + e0cadbe
commit dfbf868
Show file tree

Hide file tree

Showing 13 changed files with 1,539 additions and 1,551 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ workflows:
 jobs:
   build:
     docker:
-      - image: circleci/php:7.4.12-node-browsers
+      - image: cimg/php:8.0-browsers
         auth:
           username: troccoli
           password: $DOCKERHUB_PASSWORD

diff --git a/.docker/config/mysql/initdb.d/create_database.sql b/.docker/config/mysql/initdb.d/create_database.sql
diff --git a/.docker/database/.gitignore b/.docker/database/.gitignore
diff --git a/.env.dusk.local b/.env.dusk.local
@@ -2,7 +2,7 @@ APP_NAME="London Volleyball Association"
 APP_ENV=testing
 APP_KEY=base64:coU7gleLTqakisz6nGFVnXyrWjNxYr/5HE2zYsn/GPU=
 APP_DEBUG=true
-APP_URL=http://selenium.test
+APP_URL=http://laravel.test
 
 DB_CONNECTION=testing
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: lva
 on: [push]
 
 env:
-  node-modules-cache-name: cache-node-modules-2
-  composer-packages-cache-name: cache-composer-packages-2
+  node-modules-cache-name: cache-node-modules
+  composer-packages-cache-name: cache-composer-packages
   build-artifacts: build-artifacts
 
 jobs:
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     steps:
       - name: Setup PHP ${{ matrix.php-versoons }}
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP ${{ matrix.php-versoons }}
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     needs: [build]
     steps:
       - uses: actions/checkout@v2
@@ -114,7 +114,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     needs: [build]
     steps:
       - uses: actions/checkout@v2
@@ -162,7 +162,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     needs: [build]
     steps:
       - uses: actions/checkout@v2
@@ -215,7 +215,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.4' ]
+        php-versions: [ '8.0' ]
     needs: [build]
     steps:
       - uses: actions/checkout@v2

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 7.4.12
+  - 8.0
 
 addons:
   chrome: stable

diff --git a/app/Helpers/RolesHelper.php b/app/Helpers/RolesHelper.php
@@ -116,7 +116,7 @@ final public static function findTeam(Role $role): ?Team
         return null;
     }
 
-    final private static function buildPattern(string $template): string
+    private static function buildPattern(string $template): string
     {
         return '/^'.Str::replaceFirst('%s', '(\d+)', $template).'$/';
     }

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^8.0",
         "diglactic/laravel-breadcrumbs": "^6.1",
         "doctrine/dbal": "^2.10",
         "fakerphp/faker": "^1.14",
@@ -39,11 +39,11 @@
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.3",
         "beyondcode/laravel-dump-server": "^1.0",
-        "codedungeon/phpunit-result-printer": "^0.28.0",
         "facade/ignition": "^2.3.6",
         "fakerphp/faker": "^1.14",
         "filp/whoops": "^2.0",
         "laravel/dusk": "^6.0",
+        "laravel/sail": "^1.8",
         "mockery/mockery": "^1.4.0",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.0"