Dev: Set timezone for test DB creation, added PHP 8.5 to tests

Also fixed some test namespaces
Related to #5881

diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 23e58a772c278e2062b99cd1e430f9a31e6a17ab..80075c3f7f6e6986b5101e53db45e5c053892dd0 100644 (file)
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 64132f673a4e5e79d8324347d947100e5ac20b4c..5f4c16caf48e39d49ad62e886dbf25f6936a96f7 100644 (file)
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4', '8.5']
     steps:
     - uses: actions/checkout@v4
 

diff --git a/composer.json b/composer.json
index 2285a22cb180984368e58490eb6367be6007bddd..ab33e87a46c576403203cf3be0f81c9aa4e5a0f4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -93,6 +93,7 @@
             "@php artisan view:clear"
         ],
         "refresh-test-database": [
+            "@putenv APP_TIMEZONE=UTC",
             "@php artisan migrate:refresh --database=mysql_testing",
             "@php artisan db:seed --class=DummyContentSeeder --database=mysql_testing"
         ]

diff --git a/database/seeders/DummyContentSeeder.php b/database/seeders/DummyContentSeeder.php
index 5f787259a1852d9f07ff16b643a4b0d965e1fb16..845bea8e40f4bc37385f144823fbdb5a778844e0 100644 (file)
--- a/database/seeders/DummyContentSeeder.php
+++ b/database/seeders/DummyContentSeeder.php
@@ -13,7 +13,6 @@ use BookStack\Search\SearchIndex;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Hash;
@@ -23,10 +22,8 @@ class DummyContentSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Create an editor user
         $editorUser = User::factory()->create();

diff --git a/dev/docs/development.md b/dev/docs/development.md
index ea3e692a198bbbb039e3aac89bb8c447ceb096e0..6c250902a9f060c2c9211363fbdace925b319308 100644 (file)
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -7,7 +7,7 @@ When it's time for a release the `development` branch is merged into release wit
 
 ## Building CSS & JavaScript Assets
 
-This project uses SASS for CSS development and this is built, along with the JavaScript, using a range of npm scripts. The below npm commands can be used to install the dependencies & run the build tasks:
+This project uses SASS for CSS development which is built, along with the JavaScript, using a range of npm scripts. The below npm commands can be used to install the dependencies & run the build tasks:
 
 ``` bash
 # Install NPM Dependencies
@@ -113,4 +113,4 @@ docker-compose run app php vendor/bin/phpunit
 ### Debugging
 
 The docker-compose setup ships with Xdebug, which you can listen to on port 9090.
-NB : For some editors like Visual Studio Code, you might need to map your workspace folder to the /app folder within the docker container for this to work.
+NB: For some editors like Visual Studio Code, you might need to map your workspace folder to the /app folder within the docker container for this to work.

diff --git a/dev/docs/php-testing.md b/dev/docs/php-testing.md
index 1bd4a414ff300d97a669fb85102d7146848f96aa..3d3e91fa2bc3a276a753cab671a558bc36f46205 100644 (file)
--- a/dev/docs/php-testing.md
+++ b/dev/docs/php-testing.md
@@ -4,7 +4,7 @@ BookStack has many test cases defined within the `tests/` directory of the app.
 
 ## Setup
 
-The application tests are mostly functional, rather than unit tests, meaning they simulate user actions and system components and therefore these require use of the database. To avoid potential conflicts within your development environment, the tests use a separate database. This is defined via a specific `mysql_testing` database connection in our configuration, and expects to use the following database access details:
+The application tests are mostly functional, rather than unit tests, meaning they simulate user actions and system components, and therefore these require use of the database. To avoid potential conflicts within your development environment, the tests use a separate database. This is defined via a specific `mysql_testing` database connection in our configuration, and expects to use the following database access details:
 
 - Host: `127.0.0.1`
 - Username: `bookstack-test`

diff --git a/tests/Activity/CommentsApiTest.php b/tests/Activity/CommentsApiTest.php
index ec4ddba995c422d56c91d56dd9c44c3ed4a8f6ef..51009da3952354d70201a683b197096c3ebfd2cd 100644 (file)
--- a/tests/Activity/CommentsApiTest.php
+++ b/tests/Activity/CommentsApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Permissions\Permission;

diff --git a/tests/Entity/EntityQueryTest.php b/tests/Entity/EntityQueryTest.php
index 7d3fd38cea283fbf7619b064ced8b76ee4ca2393..180cb3076c6e934da6e0da17f1b800d48e64553e 100644 (file)
--- a/tests/Entity/EntityQueryTest.php
+++ b/tests/Entity/EntityQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace Tests\Entity;
 
 use BookStack\Entities\Models\Book;
 use Illuminate\Database\Eloquent\Builder;