feat: update LV from 10.X to 11.X

.github/workflows/nightly_unit_tests.yml

@@ -12,12 +12,59 @@ jobs:
   unit-tests:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    container:
-      image: smarcet/openstackid_test:v1.0
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    env:
+      APP_ENV: testing
+      APP_DEBUG: true
+      APP_KEY: base64:4vh0op/S1dAsXKQ2bbdCfWRyCI9r8NNIdPXyZWt9PX4=
+      DEV_EMAIL_TO: smarcet@gmail.com
+      APP_URL: http://localhost
+      DB_CONNECTION: mysql
+      DB_HOST: 127.0.0.1
+      DB_PORT: 3306
+      DB_DATABASE: idp_test
+      DB_USERNAME: root
+      DB_PASSWORD: 1qaz2wsx
+      REDIS_HOST: 127.0.0.1
+      REDIS_PORT: 6379
+      REDIS_DB: 0
+      REDIS_PASSWORD: 1qaz2wsx
+      REDIS_DATABASES: 16
+      SSL_ENABLED: false
+      SESSION_DRIVER: redis
+      PHP_VERSION: 8.3
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD:  ${{env.DB_PASSWORD}}
+          MYSQL_DATABASE: ${{env.DB_DATABASE}}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - name: 'Run Unit Tests'
-        run: cd / && ./tests.sh 2>&1 | tee /output.log
+      - name: Create Redis
+        uses: supercharge/redis-github-action@1.7.0
+        with:
+          redis-port: ${{env.REDIS_PORT}}
+          redis-password: ${{env.REDIS_PASSWORD}}
+      # Downloads a copy of the code in your repository before running CI tests
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install PHP
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version:  ${{env.PHP_VERSION}}
+          extensions: pdo_mysql, mbstring, exif, pcntl, bcmath, sockets, gettext
+      - name: Install dependencies
+        uses: "ramsey/composer-install@v3"
+        env:
+          COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.PAT }}"} }'
+      - name: 'Run Tests'
+        run: |
+          ./update_doctrine.sh
+          php artisan doctrine:migrations:migrate --no-interaction
+          php artisan db:seed --force
+          vendor/bin/phpunit --log-junit results.xml
       - name: 'Upload Unit Test Output'
         uses: actions/upload-artifact@v4
         with:

.github/workflows/pull_request_unit_tests.yml

@@ -15,15 +15,62 @@ jobs:
   unit-tests:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    container:
-        image: smarcet/openstackid_test:v1.0
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    env:
+      APP_ENV: testing
+      APP_DEBUG: true
+      APP_KEY: base64:4vh0op/S1dAsXKQ2bbdCfWRyCI9r8NNIdPXyZWt9PX4=
+      DEV_EMAIL_TO: smarcet@gmail.com
+      APP_URL: http://localhost
+      DB_CONNECTION: mysql
+      DB_HOST: 127.0.0.1
+      DB_PORT: 3306
+      DB_DATABASE: idp_test
+      DB_USERNAME: root
+      DB_PASSWORD: 1qaz2wsx
+      REDIS_HOST: 127.0.0.1
+      REDIS_PORT: 6379
+      REDIS_DB: 0
+      REDIS_PASSWORD: 1qaz2wsx
+      REDIS_DATABASES: 16
+      SSL_ENABLED: false
+      SESSION_DRIVER: redis
+      PHP_VERSION: 8.3
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD:  ${{env.DB_PASSWORD}}
+          MYSQL_DATABASE: ${{env.DB_DATABASE}}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-       - name: 'Run Unit Tests'
-         run: cd / && ./tests.sh ${{ github.event.pull_request.head.sha }} 2>&1 | tee /output.log
-       - name: 'Upload Unit Test Output'
-         uses: actions/upload-artifact@v4
-         with:
-           name: output
-           path: /output.log
-           retention-days: 5
+      - name: Create Redis
+        uses: supercharge/redis-github-action@1.7.0
+        with:
+          redis-port: ${{env.REDIS_PORT}}
+          redis-password: ${{env.REDIS_PASSWORD}}
+      # Downloads a copy of the code in your repository before running CI tests
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install PHP
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version:  ${{env.PHP_VERSION}}
+          extensions: pdo_mysql, mbstring, exif, pcntl, bcmath, sockets, gettext
+      - name: Install dependencies
+        uses: "ramsey/composer-install@v3"
+        env:
+          COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.PAT }}"} }'
+      - name: 'Run Tests'
+        run: |
+          ./update_doctrine.sh
+          php artisan doctrine:migrations:migrate --no-interaction
+          php artisan db:seed --force
+          vendor/bin/phpunit --log-junit results.xml
+      - name: 'Upload Unit Test Output'
+        uses: actions/upload-artifact@v4
+        with:
+          name: output
+          path: /output.log
+          retention-days: 5

.github/workflows/push.yml

@@ -3,29 +3,70 @@
 name: Unit Tests On Push
 
 # Controls when the workflow will run
-on:
-  # Triggers the workflow on push or pull request events but only for the "main" branch
-  push:
-     branches: [ "main" ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+on: push
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "unit-tests"
   unit-tests:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    container:
-        image: smarcet/openstackid_test:v1.0
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    env:
+      APP_ENV: testing
+      APP_DEBUG: true
+      APP_KEY: base64:4vh0op/S1dAsXKQ2bbdCfWRyCI9r8NNIdPXyZWt9PX4=
+      DEV_EMAIL_TO: smarcet@gmail.com
+      APP_URL: http://localhost
+      DB_CONNECTION: mysql
+      DB_HOST: 127.0.0.1
+      DB_PORT: 3306
+      DB_DATABASE: idp_test
+      DB_USERNAME: root
+      DB_PASSWORD: 1qaz2wsx
+      REDIS_HOST: 127.0.0.1
+      REDIS_PORT: 6379
+      REDIS_DB: 0
+      REDIS_PASSWORD: 1qaz2wsx
+      REDIS_DATABASES: 16
+      SSL_ENABLED: false
+      SESSION_DRIVER: redis
+      PHP_VERSION: 8.3
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD:  ${{env.DB_PASSWORD}}
+          MYSQL_DATABASE: ${{env.DB_DATABASE}}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-       - name: 'Run Unit Tests'
-         run: cd / && ./tests.sh 2>&1 | tee /output.log
+       - name: Create Redis
+         uses: supercharge/redis-github-action@1.7.0
+         with:
+           redis-port: ${{env.REDIS_PORT}}
+           redis-password: ${{env.REDIS_PASSWORD}}
+       # Downloads a copy of the code in your repository before running CI tests
+       - name: Check out repository code
+         uses: actions/checkout@v4
+       - name: Install PHP
+         uses: "shivammathur/setup-php@v2"
+         with:
+           php-version:  ${{env.PHP_VERSION}}
+           extensions: pdo_mysql, mbstring, exif, pcntl, bcmath, sockets, gettext
+       - name: Install dependencies
+         uses: "ramsey/composer-install@v3"
+         env:
+           COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.PAT }}"} }'
+       - name: 'Run Tests'
+         run: |
+           ./update_doctrine.sh
+           php artisan doctrine:migrations:migrate --no-interaction
+           php artisan db:seed --force
+           vendor/bin/phpunit --log-junit results.xml
        - name: 'Upload Unit Test Output'
          uses: actions/upload-artifact@v4
          with:
            name: output
-           path: /output.log
+           path: results.xml
            retention-days: 5

.gitignore

@@ -14,7 +14,7 @@ doc/build
 Homestead.yaml
 Homestead.json
 .env
-.env.testing
+.env.*
 storage/proxies
 /public/assets/jquery-cookie/
 /public/assets/crypto-js/
@@ -50,4 +50,4 @@ model.sql
 /public/assets/*.txt
 /.env.local
 /.phpunit.cache/
-docker-compose/mysql/model/*.sql
+docker-compose/mysql/model/*.sql

Dockerfile

@@ -1,9 +1,9 @@
-FROM php:7.4-fpm
+FROM php:8.3-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NVM_VERSION="v0.39.7"
 ARG GITHUB_OAUTH_TOKEN
-ARG XDEBUG_VERSION="xdebug-3.1.6"
+ARG XDEBUG_VERSION="xdebug-3.3.2"
 
 ENV NVM_VERSION=$NVM_VERSION
 ENV NODE_VERSION="18.20.4"

app/Http/Controllers/Api/ClientPublicKeyApiController.php

@@ -98,7 +98,7 @@ public function _delete($owner_id, $public_key_id)
     protected function getCreatePayloadValidationRules(): array
     {
             return [
-                'client_id'   => 'required|integer',
+                'owner_id'    => 'required|integer',
                 'kid'         => 'required|text|max:255',
                 'active'      => 'required|boolean',
                 'valid_from'  => 'required|date_format:m/d/Y',

app/Http/Kernel.php

@@ -30,7 +30,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \App\Http\Middleware\SingleAccessPoint::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\ParseMultipartFormDataInputForNonPostRequests::class,
     ];
 

app/Http/Utils/Log/LaravelMailerHandler.php

@@ -156,8 +156,8 @@ protected function send($content, array $records):void
                 $message
                     ->to($to)
                     ->subject($subject)
-                    ->setBody($content, 'text/html')
-                    ->setFrom($this->from);
+                    ->html($content)
+                    ->from($this->from);
             });
         }
     }

app/Models/OAuth2/OAuth2OTP.php

@@ -24,7 +24,7 @@
 use OAuth2\Requests\OAuth2AccessTokenRequestPasswordless;
 use Utils\IPHelper;
 use Utils\Model\Identifier;
-use Zend\Math\Rand;
+use Laminas\Math\Rand;
 
 /**
  * @ORM\Entity(repositoryClass="App\Repositories\DoctrineOAuth2OTPRepository")

app/Providers/AppServiceProvider.php

@@ -37,7 +37,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if(!App::isLocal())
+        if (!App::isLocal())
             URL::forceScheme('https');
 
         $logger = Log::getLogger();

app/Providers/EventServiceProvider.php

@@ -150,7 +150,7 @@ public function boot()
         Event::listen(\Illuminate\Mail\Events\MessageSending::class, function($event){
             $devEmail = env('DEV_EMAIL_TO', null);
             if(in_array(App::environment(), ['local','dev','testing']) && !empty($devEmail)){
-                $event->message->setTo(explode(",", $devEmail));
+                $event->message->to(explode(",", $devEmail));
             }
             return true;
         });

app/Services/OAuth2/ClientCredentialGenerator.php

@@ -16,7 +16,7 @@
 use OAuth2\Models\IClient;
 use OAuth2\OAuth2Protocol;
 use OAuth2\Services\IClientCredentialGenerator;
-use Zend\Math\Rand;
+use Laminas\Math\Rand;
 use DateTime;
 use DateInterval;
 /**

app/Services/OAuth2/TokenService.php

@@ -86,7 +86,7 @@
 use Utils\Services\IdentifierGenerator;
 use Utils\Services\ILockManagerService;
 use Utils\Services\IServerConfigurationService;
-use Zend\Crypt\Hash;
+use Laminas\Crypt\Hash;
 use Exception;
 
 /**

app/Services/UserActionService.php

@@ -56,6 +56,7 @@ public function addUserAction($user_id, $ip, $user_action, $realm = null, $user_
     {
         return $this->tx_service->transaction(function () use ($user_id, $ip, $user_action, $realm, $user_email) {
 
+            Log::debug(sprintf("UserActionService::addUserAction user %s action %s ip %s", $user_id, $user_action, $ip));
             $action = new UserAction();
             $action->setFromIp($ip);
             $action->setUserAction($user_action);