feat: allow moderators on opt-in roles

.github/workflows/laravel.yml

@@ -2,41 +2,116 @@ name: Laravel
 
 on:
   push:
-    branches: [ 4.x ]
+    branches: [ "5.x" ]
   pull_request:
-    branches: [ 4.x ]
+    branches: [ "5.x" ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  laravel:
+  lint:
+    name: Lint & Static Analysis
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: mbstring, dom, fileinfo, pgsql, pdo_pgsql, redis
+          coverage: none
 
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Dependencies
+        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Check Coding Standards
+        run: composer run test:lint
+
+      - name: Static Analysis
+        run: composer run test:types
+
+      - name: Type Coverage
+        run: composer run test:type-coverage
+
+  test:
+    name: Tests (Shard ${{ matrix.shard }}/4)
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3, 4]
+
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_DB: testbench
+          POSTGRES_USER: default
+          POSTGRES_PASSWORD: secret
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U default -d testbench"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+      redis:
+        image: redis:7
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup PHP, with composer and extensions
-      uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-      with:
-        php-version: '8.1'
-        extensions: mbstring, dom, fileinfo
-        coverage: xdebug #optional
-    - uses: getong/mariadb-action@v1.1
-      with:
-        #host port: 3308 # Optional, default value is 3306. The port of host
-        mariadb version: '10.7' # Optional, default value is "latest". The version of the MariaDB
-        mysql database: 'testbench' # Optional, default value is "test". The specified database which will be create
-        mysql user: 'default' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too
-        mysql password: 'secret' # Required if "mysql user" exists. The password for the "mysql user"
-    - name: Redis Server in GitHub Actions
-      uses: supercharge/redis-github-action@1.1.0
-      with:
-        # Redis version to use
-        redis-version: 5 # optional, default is latest
-    - name: Install Dependencies
-      run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-    - name: Test & publish code coverage
-      uses: paambaati/codeclimate-action@v2.6.0
-      env:
-        CC_TEST_REPORTER_ID: 1ba66b56bc5a04c17474d52e94124cb04d4a520c7c46a01ace9ce25e7b58b85d
-      with:
-        coverageCommand: vendor/bin/pest --coverage --ci
-        debug: false
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: mbstring, dom, fileinfo, pgsql, pdo_pgsql, redis
+          coverage: none
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Dependencies
+        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Run Tests
+        run: vendor/bin/pest --no-coverage --shard=${{ matrix.shard }}/4
+
+  laravel:
+    name: Laravel
+    runs-on: ubuntu-latest
+    needs: [lint, test]
+    if: always()
+    steps:
+      - name: Check all jobs passed
+        run: |
+          if [[ "${{ needs.lint.result }}" != "success" || "${{ needs.test.result }}" != "success" ]]; then
+            echo "One or more jobs failed"
+            exit 1
+          fi
+          echo "All jobs passed"
+

.github/workflows/php-cs-fixer.yml

@@ -1,23 +1,23 @@
-name: Check & fix styling
+name: Check styling
 
 on: [push]
 
 jobs:
-  php-cs-fixer:
+  pint:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.head_ref }}
+        uses: actions/checkout@v4
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: --config=.php_cs.dist.php --allow-risky=yes
+          php-version: '8.3'
+          coverage: none
 
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Fix styling
+      - name: Install Dependencies
+        run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Check styling
+        run: vendor/bin/pint --test

.gitignore

@@ -12,6 +12,7 @@ public/css/
 .php_cs
 .php_cs.cache
 .phpunit.result.cache
+.phpunit.cache/
 .php-cs-fixer.cache
 
 public/js/

composer.json

@@ -25,24 +25,26 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": "^8.1",
-        "laravel/framework": "^10.0",
+        "php": "^8.3",
+        "laravel/framework": "^11.0",
         "laravel/socialite": "^5.0",
-        "seatplus/eveapi": "^3.1",
-        "seatplus/auth": "^3.0",
-        "tightenco/ziggy": "^2.2.1",
-        "spatie/laravel-permission": "^5.4",
+        "seatplus/eveapi": "^4.0",
+        "seatplus/auth": "^4.0.5",
         "conedevelopment/i18n": "^1.1",
         "doctrine/dbal": "^3.0",
-        "inertiajs/inertia-laravel": "^1.2.0"
+        "inertiajs/inertia-laravel": "^2.0",
+        "laravel/wayfinder": "^0.1.16"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
-        "nunomaduro/collision": "^7.0",
-        "rector/rector": "^0.18.6",
-        "driftingly/rector-laravel": "^0.29.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0"
+        "orchestra/testbench": "^9.0",
+        "nunomaduro/collision": "^8.1",
+        "rector/rector": "^2.0",
+        "driftingly/rector-laravel": "^2.0",
+        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.9",
+        "pestphp/pest": "^4.0",
+        "pestphp/pest-plugin-laravel": "^4.0",
+        "pestphp/pest-plugin-type-coverage": "^4"
     },
     "extra": {
         "laravel": {
@@ -52,9 +54,18 @@
         }
     },
     "scripts": {
-      "test": "vendor/bin/pest",
-      "test-coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage",
-      "parallel": "vendor/bin/testbench package:test --parallel --no-coverage"
+        "lint": "vendor/bin/pint",
+        "test:lint": "vendor/bin/pint --test",
+        "test:types": "vendor/bin/phpstan --ansi",
+        "test:type-coverage": "vendor/bin/pest --type-coverage --min=100",
+        "test:unit": "vendor/bin/pest --colors=always --no-coverage",
+        "test:unit-coverage": "XDEBUG_MODE=coverage vendor/bin/pest --coverage --colors=always",
+        "test": [
+            "@test:lint",
+            "@test:types",
+            "@test:type-coverage",
+            "@test:unit"
+        ]
     },
     "config": {
         "allow-plugins": {

config/package.sidebar.php

@@ -25,9 +25,9 @@
  */
 
 return [
-    'home'     => [
+    'home' => [
         [
-            'name'  => 'Home',
+            'name' => 'Home',
             'route' => 'home',
             'icon' => 'HomeIcon',
         ],
@@ -104,19 +104,19 @@
     ],
     'settings' => [
         [
-            'name'  => 'Server Settings',
+            'name' => 'Server Settings',
             'permission' => 'superuser',
             'route' => 'server.settings',
             'icon' => 'CogIcon',
         ],
         [
-            'name'  => 'Manual Locations',
+            'name' => 'Manual Locations',
             'permission' => 'manage manual locations',
             'route' => 'manage.manual_locations',
             'icon' => 'MapIcon',
         ],
         [
-            'name'  => 'Server Performance',
+            'name' => 'Server Performance',
             'permission' => 'superuser',
             'route' => 'performance.index',
             'icon' => 'FireIcon',

config/web.images.php

@@ -3,4 +3,4 @@
 return [
     'logo' => env('LOGO_PATH', 'img/seat_plus.svg'),
     'icon' => env('ICON_PATH', 'img/seat_plus_logo.svg'),
-];
+];

config/web.permissions.php

@@ -25,9 +25,6 @@
  */
 
 return [
-    'create,update and delete access control group',
-    'manage access control group',
-
     'view member tracking',
     'view member compliance',
     'member compliance: review user',

database/migrations/2022_10_19_221652_create_onboardings_table.php

@@ -30,7 +30,6 @@
 
 return new class extends Migration
 {
-
     public function up()
     {
         Schema::create('onboardings', function (Blueprint $table) {
@@ -39,5 +38,4 @@ public function up()
             $table->timestamps();
         });
     }
-
 };