Merge branch 'master' into migrate_settings_vue

.env.example

@@ -8,9 +8,6 @@ LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-GITHASH_LOG_CONTEXT_ENABLED=true
-GITHASH_CACHE_ENABLED=false
-
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 # DB_HOST=mysql

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
 
 env:
   PHP_VERSION: "8.1"
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "16"
 
 jobs:
   laravel-tests:
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -31,7 +31,7 @@ jobs:
       - name: Static code analysis
         run: php ./vendor/bin/phpstan analyse --no-progress
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Install NPM packages
@@ -57,14 +57,3 @@ jobs:
       #     SESSION_DRIVER: array
       #     QUEUE_DRIVER: sync
       #   run: vendor/bin/phpunit
-
-  php-security-checker:
-    name: Local PHP Security Checker
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Local PHP Security Checker
-        uses: docker://pplotka/local-php-security-checker-github-actions

.github/workflows/maintenance.yaml

@@ -0,0 +1,19 @@
+name: Workflow maintenance
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 1 1 * *"
+
+jobs:
+  cleanup:
+    name: Delete old workflow runs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 30
+          keep_minimum_runs: 6

.github/workflows/prod.yaml

@@ -6,31 +6,27 @@ on:
 
 env:
   PHP_VERSION: "8.1"
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "16"
 
 jobs:
   pre-release:
     name: "Pre Release"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist  --optimize-autoloader --no-dev
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm ci
       - run: npm run build
-      - name: Store Git hash
-        shell: bash
-        run: |
-          echo "$(git rev-parse HEAD)" >> storage/githash.cache
       - name: Archive Release
         uses: thedoctor0/zip-release@master
         with:

.github/workflows/release.yaml

@@ -7,31 +7,31 @@ on:
 
 env:
   PHP_VERSION: "8.1"
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "16"
 
 jobs:
   tagged-release:
     name: "Tagged Release"
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist  --optimize-autoloader --no-dev
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm ci
       - run: npm run build
-      - name: Store Git hash
+      - name: Store release version
         shell: bash
         run: |
-          echo "$(git rev-parse HEAD)" >> storage/githash.cache
+          echo "${{ github.ref_name }}" >> RELEASE
       - name: Archive Release
         uses: thedoctor0/zip-release@master
         with:

.github/workflows/staging.yaml

@@ -11,7 +11,7 @@ on:
 env:
   PHP_BIN: php81
   PHP_VERSION: '8.1'
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "16"
 
 jobs:
   check-secret:
@@ -38,11 +38,7 @@ jobs:
     if: (github.repository == 'OHFLesvos/ohf-community' && needs.check-secret.outputs.remote-data == 'true')
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Store Git hash
-      shell: bash
-      run: |
-        echo "$(git rev-parse HEAD)" >> storage/githash.cache
+      uses: actions/checkout@v3
     - name: Setup PHP
       id: setup-php
       uses: shivammathur/setup-php@v2
@@ -51,11 +47,15 @@ jobs:
     - name: Install Dependencies
       run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist  --optimize-autoloader --no-dev
     - name: Use Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ env.NODE_VERSION }}
     - run: npm ci
     - run: npm run build
+    - name: Store release version
+      shell: bash
+      run: |
+        echo "${{ github.ref_name }}" >> RELEASE
     - name: Enable maintenance mode on remote
       uses: appleboy/ssh-action@master
       with:

.gitignore

@@ -20,3 +20,5 @@ _ide_helper.php
 .phpstorm.meta.php
 .php-cs-fixer.cache
 storage/githash.cache
+.DS_Store
+app/RELEASE

.vscode/extensions.json

@@ -20,7 +20,6 @@
         "amiralizadeh9480.laravel-extra-intellisense",
         "codingyu.laravel-goto-view",
         "open-southeners.laravel-pint",
-        "stef-k.laravel-goto-controller",
         "damianbal.vs-phpclassgen",
         "bmewburn.vscode-intelephense-client",
         "octref.vetur"

.vscode/settings.json

@@ -45,5 +45,6 @@
         "webling",
         "xampp"
     ],
-    "git.pullTags": false
+    "git.pullTags": false,
+    "editor.formatOnSave": false
 }

Changelog.md

@@ -1,7 +1,18 @@
 # Changelog
 
-## NEXT
+## 4.2.0
 
+* Add parent-child relations to visitors
+
+## 4.1.0
+
+* Add full-text search to visitor name, improving search usability (searching for LASTNAME SURNAME works the same as SURNAME LASTNAME)
+
+## 4.0.0
+
+* Require PHP 8.1
+* Extended visitor report
+* Removed knowledge base
 * Added support for specifying email domain for Google OAuth login
 * Store avatar images locally
 * Update icon library (Font Awesome 6)
@@ -16,6 +27,18 @@
 * Add a liability form signed field to visitor records
 * Add remarks field to visitor records
 
+## 3.7.3
+
+* Added visitor data to export file
+
+## 3.7.2
+
+* Make visitor date of birth non-mandatory
+
+## 3.7.1
+
+* Make ID number not required anymore for visitor registration
+
 ## 3.7.0
 
 * Allow editing of transaction metadata (with specific user permission) for controlled transactions

app/Console/Kernel.php

@@ -10,7 +10,6 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
      */
     protected function schedule(Schedule $schedule)

app/Exceptions/Handler.php

@@ -58,7 +58,6 @@ public function register()
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $exception
      * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Throwable
@@ -82,7 +81,6 @@ public function render($request, Throwable $exception)
      * Convert an authentication exception into an unauthenticated response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Auth\AuthenticationException  $exception
      * @return \Illuminate\Http\Response|JsonResponse|RedirectResponse
      */
     protected function unauthenticated($request, AuthenticationException $exception)

app/Exports/Fundraising/DonationsExport.php

@@ -21,7 +21,7 @@ public function __construct(private ?Donor $donor = null)
     {
     }
 
-    private function getDonationsQuery(?int $year = null)
+    private function getDonationsQuery(int $year = null)
     {
         return $this->donor != null
             ? $this->donor->donations()

app/Exports/Fundraising/DonorsExport.php

@@ -131,9 +131,6 @@ public function map($donor): array
         return $map;
     }
 
-    /**
-     * @return array
-     */
     public function columnFormats(): array
     {
         $formats = [];

app/Http/Controllers/Accounting/API/CategoriesController.php

@@ -65,8 +65,8 @@ public function index(Request $request): JsonResource
     private function filterQuery(Builder $query, string $filter): Builder
     {
         return $query->where(fn (Builder $wq) => $wq
-                ->where('name', 'LIKE', '%'.$filter.'%')
-                ->orWhere('description', 'LIKE', '%'.$filter.'%')
+            ->where('name', 'LIKE', '%'.$filter.'%')
+            ->orWhere('description', 'LIKE', '%'.$filter.'%')
         );
     }
 

app/Http/Controllers/Accounting/API/ProjectsController.php

@@ -64,7 +64,8 @@ public function index(Request $request)
 
     private function filterQuery(Builder $query, string $filter): Builder
     {
-        return $query->where(fn (Builder $wq) => $wq
+        return $query->where(
+            fn (Builder $wq) => $wq
                 ->where('name', 'LIKE', '%'.$filter.'%')
                 ->orWhere('description', 'LIKE', '%'.$filter.'%')
         );

app/Http/Controllers/Accounting/API/SuppliersController.php

@@ -70,13 +70,13 @@ public function index(Request $request)
     private function filterQuery(Builder $query, string $filter): Builder
     {
         return $query->where(fn (Builder $wq) => $wq
-                ->where('name', 'LIKE', '%'.$filter.'%')
-                ->orWhere('category', 'LIKE', '%'.$filter.'%')
-                ->orWhere('remarks', 'LIKE', '%'.$filter.'%')
-                ->orWhere('tax_number', $filter)
-                ->orWhere(DB::raw('REPLACE(phone, \' \', \'\')'), str_replace(' ', '', $filter))
-                ->orWhere(DB::raw('REPLACE(mobile, \' \', \'\')'), str_replace(' ', '', $filter))
-                ->orWhere(DB::raw('REPLACE(iban, \' \', \'\')'), str_replace(' ', '', $filter))
+            ->where('name', 'LIKE', '%'.$filter.'%')
+            ->orWhere('category', 'LIKE', '%'.$filter.'%')
+            ->orWhere('remarks', 'LIKE', '%'.$filter.'%')
+            ->orWhere('tax_number', $filter)
+            ->orWhere(DB::raw('REPLACE(phone, \' \', \'\')'), str_replace(' ', '', $filter))
+            ->orWhere(DB::raw('REPLACE(mobile, \' \', \'\')'), str_replace(' ', '', $filter))
+            ->orWhere(DB::raw('REPLACE(iban, \' \', \'\')'), str_replace(' ', '', $filter))
         );
     }
 

app/Http/Controllers/Accounting/WeblingApiController.php

@@ -173,8 +173,8 @@ public function store(Wallet $wallet, Request $request): RedirectResponse
                 $bookedTransactions[] = $transaction->id;
             } catch (Exception $e) {
                 return redirect()->back()
-                        ->withInput()
-                        ->with('error', $e->getMessage());
+                    ->withInput()
+                    ->with('error', $e->getMessage());
             }
         }
 

app/Http/Controllers/Auth/LoginController.php

@@ -88,7 +88,6 @@ public function showLoginForm()
     /**
      * Handle a login request to the application.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response|View
      *
      * @throws \Illuminate\Validation\ValidationException

app/Http/Controllers/Auth/RegisterController.php

@@ -68,7 +68,6 @@ public function __construct()
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
@@ -97,7 +96,6 @@ protected function validator(array $data)
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
      * @return User
      */
     protected function create(array $data)

app/Http/Controllers/CommunityVolunteers/BaseController.php

@@ -147,11 +147,13 @@ protected function getFields(): array
                 'assign' => function ($cmtyvol, $value) {
                     if (collect([__('Female'), 'f', 'w', 'Frau', 'Fräulein', 'Fr.', 'Fr', 'Frl.', 'Frl', 'Missus', 'Missis', 'Miss', 'Mrs.', 'Mrs', 'Ms.', 'Ms'])
                         ->map(fn ($t) => strtolower($t))
-                        ->contains(strtolower($value))) {
+                        ->contains(strtolower($value))
+                    ) {
                         $cmtyvol->gender = 'f';
                     } elseif (collect([__('Male'), 'm', 'Herr', 'Hr.', 'Hr', 'Mister', 'Mr.', 'Mr'])
                         ->map(fn ($t) => strtolower($t))
-                        ->contains(strtolower($value))) {
+                        ->contains(strtolower($value))
+                    ) {
                         $cmtyvol->gender = 'm';
                     } else {
                         $cmtyvol->gender = null;
@@ -205,8 +207,8 @@ protected function getFields(): array
             [
                 'label' => __('Languages'),
                 'icon' => 'language',
-                'value' => fn (CommunityVolunteer $cmtyvol) => $cmtyvol->languages != null ? (is_array($cmtyvol->languages) ? implode(', ', $cmtyvol->languages) : $cmtyvol->languages) : null,
-                'value_html' => fn (CommunityVolunteer $cmtyvol) => $cmtyvol->languages != null ? (is_array($cmtyvol->languages) ? implode('<br>', $cmtyvol->languages) : $cmtyvol->languages) : null,
+                'value' => fn (CommunityVolunteer $cmtyvol) => $cmtyvol->languages != null ? implode(', ', $cmtyvol->languages) : null,
+                'value_html' => fn (CommunityVolunteer $cmtyvol) => $cmtyvol->languages != null ? implode('<br>', $cmtyvol->languages) : null,
                 'overview' => false,
                 'section' => 'general',
                 'assign' => function ($cmtyvol, $value) {