Merge remote-tracking branch 'remotes/origin/main'

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/99

.github/workflows/artifact-csharp-mvc.yml

@@ -3,10 +3,10 @@ name: Artifact Csharp MVC
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/csharp-mvc/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/csharp-mvc/**']
 
 jobs:

.github/workflows/artifact-csharp.yml

@@ -3,10 +3,10 @@ name: Artifact Csharp
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/csharp/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/csharp/**']
 
 jobs:

.github/workflows/artifact-go.yml

@@ -3,10 +3,10 @@ name: Artifact Golang
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/go/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/go/**']
 
 jobs:

.github/workflows/artifact-java.yml

@@ -3,10 +3,10 @@ name: Artifact Java
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

.github/workflows/artifact-node.yml

@@ -3,10 +3,10 @@ name: Artifact Nodejs
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/nodejs/**']
 
 jobs:

.github/workflows/artifact-php-laravel.yml

@@ -3,10 +3,10 @@ name: Artifact PHP Laravel
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/php-laravel/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/php-laravel/**']
 
 jobs:

.github/workflows/artifact-php.yml

@@ -3,10 +3,10 @@ name: Artifact PHP
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/php/**']
 
 jobs:

.github/workflows/artifact-python.yml

@@ -3,10 +3,10 @@ name: Artifact Python
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

.github/workflows/artifact-ruby.yml

@@ -3,10 +3,10 @@ name: Artifact Ruby
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

.github/workflows/artifact-spring.yml

@@ -3,10 +3,10 @@ name: Artifact Java Spring
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master]
+    branches: [main]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

.github/workflows/create-tag.yml

@@ -2,7 +2,7 @@ name: Create Tag
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths-ignore:
       - '.github/**'
       - '**/AUTHORS.md'

.github/workflows/licenses-csharp-mvc.yml

@@ -3,10 +3,10 @@ name: Licenses Csharp MVC
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/csharp-mvc/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/csharp-mvc/**']
 
 jobs:

.github/workflows/licenses-csharp.yml

@@ -3,10 +3,10 @@ name: Licenses Csharp
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/csharp/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/csharp/**']
 
 jobs:

.github/workflows/licenses-go.yml

@@ -3,10 +3,10 @@ name: Licenses Go
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/go/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/go/**']
 
 jobs:
@@ -15,6 +15,10 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.23'
       - name: Submodule Update
         run: |
           cd ${{ github.workspace }}

.github/workflows/licenses-java.yml

@@ -3,10 +3,10 @@ name: Licenses Java
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

.github/workflows/licenses-nodejs.yml

@@ -3,10 +3,10 @@ name: Licenses Nodejs
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/nodejs/**']
 
 env:

.github/workflows/licenses-php-laravel.yml

@@ -3,10 +3,10 @@ name: Licenses PHP Laravel
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php-laravel/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php-laravel/**']
 
 jobs:

.github/workflows/licenses-php.yml

@@ -3,10 +3,10 @@ name: Licenses PHP
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php/**']
 
 jobs:

.github/workflows/licenses-python.yml

@@ -3,10 +3,10 @@ name: Licenses Python
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

.github/workflows/licenses-ruby.yml

@@ -3,10 +3,10 @@ name: Licenses Ruby
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

.github/workflows/licenses-spring.yml

@@ -3,10 +3,10 @@ name: Licenses Java Spring
 on:
   workflow_dispatch:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

.github/workflows/lint-go.yml

@@ -3,10 +3,10 @@ name: Golangci
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/go/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/go/**']
 
 jobs:

.github/workflows/lint-java.yml

@@ -3,10 +3,10 @@ name: Lint Java
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

.github/workflows/lint-nodejs.yml

@@ -3,10 +3,10 @@ name: ESLint
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/nodejs/**']
 
 env:

.github/workflows/lint-php-laravel.yml

@@ -3,10 +3,10 @@ name: Laravel Pint
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php-laravel/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php-laravel/**']
 
 jobs:

.github/workflows/lint-php.yml

@@ -3,10 +3,10 @@ name: PHPCs
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/php/**']
 
 jobs:

.github/workflows/lint-python.yml

@@ -3,10 +3,10 @@ name: PyLint
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

.github/workflows/lint-ruby.yml

@@ -3,10 +3,10 @@ name: Rubocop
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

.github/workflows/lint-spring.yml

@@ -3,10 +3,10 @@ name: Lint Spring
 on:
   workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, develop]
+    branches: [main, develop]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

Readme.md

@@ -8,16 +8,16 @@ These examples show the way to integrate [ONLYOFFICE Docs][2] into your own webs
 The package contains examples written in .Net (C# MVC), .Net (C#), Go, Java, Java Spring, Node.js, PHP, PHP (Laravel), Python and Ruby.
 
 You should change `http://documentserver` to your server address in these files:
-* [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
-* [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
-* [Go](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/go) - `web\documentserver-example\go\config\configuration.json`
-* [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
-* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
-* [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
-* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
-* [PHP (Laravel)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php-laravel) - `web/documentserver-example/php-laravel/.env.example`
-* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
-* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
+* [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
+* [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
+* [Go](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/go) - `web\documentserver-example\go\config\configuration.json`
+* [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
+* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
+* [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
+* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
+* [PHP (Laravel)](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/php-laravel) - `web/documentserver-example/php-laravel/.env.example`
+* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
+* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/main/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
 
 More information on how to use these examples can be found here: [https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/)
 

web/documentserver-example/php-laravel/app/Http/Middleware/CheckAndDecodeJWTPayload.php

@@ -14,7 +14,7 @@ class CheckAndDecodeJWTPayload
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

web/documentserver-example/php-laravel/app/Http/Middleware/EnsureForgottenPageEnabled.php

@@ -11,7 +11,7 @@ class EnsureForgottenPageEnabled
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

web/documentserver-example/php-laravel/app/Http/Middleware/EnsureJWTTokenIsPresent.php

@@ -14,7 +14,7 @@ class EnsureJWTTokenIsPresent
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

web/documentserver-example/php-laravel/app/Http/Middleware/EnsureUserDirectoryExists.php

@@ -12,7 +12,7 @@ class EnsureUserDirectoryExists
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

web/documentserver-example/php-laravel/bootstrap/providers.php

@@ -1,5 +1,7 @@
 <?php
 
+use App\Providers\AppServiceProvider;
+
 return [
-    App\Providers\AppServiceProvider::class,
+    AppServiceProvider::class,
 ];

web/documentserver-example/php-laravel/config/auth.php

@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\User;
+
 return [
 
     /*
@@ -62,7 +64,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+            'model' => env('AUTH_MODEL', User::class),
         ],
 
         // 'users' => [

web/documentserver-example/php-laravel/database/factories/UserFactory.php

@@ -2,12 +2,13 @@
 
 namespace Database\Factories;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
+ * @extends Factory<User>
  */
 class UserFactory extends Factory
 {

web/documentserver-example/python/.check-licenses.yml

@@ -47,3 +47,15 @@
     :why: MIT
     :versions: []
     :when: 2025-11-07 10:13:51.477550000 Z
+- - :approve
+  - msgspec
+  - :who:
+    :why: BSD-3-Clause
+    :versions: []
+    :when: 2025-11-07 10:13:51.477550000 Z
+- - :approve
+  - pyjwt
+  - :who:
+    :why: MIT
+    :versions: []
+    :when: 2025-11-07 10:13:51.477550000 Z