flusio · marienfressinaud · Sep 19, 2024 · Sep 19, 2024 · Sep 19, 2024
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -0,0 +1,63 @@
+name: Linters
+
+on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+env:
+    NO_DOCKER: true
+
+jobs:
+    build:
+        runs-on: ${{ matrix.operating-system }}
+
+        strategy:
+            matrix:
+                operating-system: [ubuntu-22.04]
+                php-versions: ['8.2', '8.3']
+
+        name: PHP ${{ matrix.php-versions }} CI on ${{ matrix.operating-system }}
+
+        steps:
+        - uses: actions/checkout@v2
+          with:
+              submodules: true
+
+        - name: Setup PHP
+          uses: shivammathur/setup-php@v2
+          with:
+              php-version: ${{ matrix.php-versions }}
+              coverage: xdebug
+              extensions: intl, gettext, pcntl, gd, pdo, pdo_pgsql
+              ini-values: browscap=${{ github.workspace }}/docker/lite_php_browscap.ini
+
+        - name: Setup locales
+          run: |
+              sudo apt-get install locales
+              sudo locale-gen fr_FR.UTF-8 en_GB.UTF-8
+
+        - name: Get composer cache directory
+          id: composer-cache
+          run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+        - name: Cache composer dependencies
+          uses: actions/cache@v2
+          with:
+              path: ${{ steps.composer-cache.outputs.dir }}
+              key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+              restore-keys: ${{ runner.os }}-composer-
+
+        - name: Cache node dependencies
+          uses: actions/cache@v2
+          with:
+              path: ~/.npm
+              key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+              restore-keys: ${{ runner.os }}-node-
+
+        - name: Install dependencies
+          run: make install
+
+        - name: Run the linters
+          run: make lint
diff --git a/.github/workflows/ci.yml → .github/workflows/tests.yml b/.github/workflows/ci.yml → .github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: Tests
 
 on:
     push:
@@ -14,8 +14,6 @@ env:
     DB_PASSWORD: postgres
     COVERAGE: --coverage-text
     MOCK_HOST: "http://127.0.0.1:8001"
-    APP_SUBSCRIPTIONS_HOST: ${{ secrets.APP_SUBSCRIPTIONS_HOST }}
-    APP_SUBSCRIPTIONS_PRIVATE_KEY: ${{ secrets.APP_SUBSCRIPTIONS_PRIVATE_KEY }}
 
 jobs:
     build:
@@ -67,24 +65,14 @@ jobs:
               key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
               restore-keys: ${{ runner.os }}-composer-
 
-        - name: Cache node dependencies
-          uses: actions/cache@v2
-          with:
-              path: ~/.npm
-              key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-              restore-keys: ${{ runner.os }}-node-
-
         - name: Install dependencies
-          run: make install
+          run: composer install
 
         - name: Setup the application
           run: make setup
           env:
               DB_PORT: ${{ job.services.postgres.ports[5432] }}
 
-        - name: Run the linters
-          run: make lint
-
         - name: Run mock_server (background)
           run: php -t ${{ github.workspace }} -S 127.0.0.1:8001 ${{ github.workspace }}/tests/mock_server/index.php &
 

diff --git a/lib/Minz b/lib/Minz
diff --git a/tests/ApplicationTest.php b/tests/ApplicationTest.php
@@ -8,10 +8,10 @@
 
 class ApplicationTest extends \PHPUnit\Framework\TestCase
 {
+    use \Minz\Tests\InitializerHelper;
+    use \Minz\Tests\ResponseAsserts;
     use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \tests\LoginHelper;
-    use \Minz\Tests\ResponseAsserts;
 
     public function testRunSetsTheDefaultLocale(): void
     {

diff --git a/tests/InitializerHelper.php b/tests/InitializerHelper.php
diff --git a/tests/auth/CurrentUserTest.php b/tests/auth/CurrentUserTest.php
@@ -9,8 +9,8 @@
 
 class CurrentUserTest extends \PHPUnit\Framework\TestCase
 {
+    use \Minz\Tests\InitializerHelper;
     use \tests\FakerHelper;
-    use \tests\InitializerHelper;
 
     #[\PHPUnit\Framework\Attributes\Before]
     public function resetCurrentUser(): void

diff --git a/tests/cli/ApplicationTest.php b/tests/cli/ApplicationTest.php
@@ -4,7 +4,7 @@
 
 class ApplicationTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\InitializerHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
 
     public function testRunDoesntFail(): void

diff --git a/tests/cli/FeatureFlagsTest.php b/tests/cli/FeatureFlagsTest.php
@@ -8,10 +8,10 @@
 
 class FeatureFlagsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/cli/FeedsTest.php b/tests/cli/FeedsTest.php
@@ -7,11 +7,11 @@
 
 class FeedsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
-    use \tests\MockHttpHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\MockHttpHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/cli/MediaTest.php b/tests/cli/MediaTest.php
@@ -11,10 +11,10 @@
 
 class MediaTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\InitializerHelper;
-    use \tests\MockHttpHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\MockHttpHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/cli/SystemTest.php b/tests/cli/SystemTest.php
@@ -4,8 +4,8 @@
 
 class SystemTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]

diff --git a/tests/cli/TopicsTest.php b/tests/cli/TopicsTest.php
@@ -8,10 +8,10 @@
 
 class TopicsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/cli/UrlsTest.php b/tests/cli/UrlsTest.php
@@ -4,10 +4,10 @@
 
 class UrlsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\MockHttpHelper;
     use \Minz\Tests\ApplicationHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\MockHttpHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/cli/UsersTest.php b/tests/cli/UsersTest.php
@@ -8,12 +8,12 @@
 
 class UsersTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
-    use \tests\MockHttpHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
     use \Minz\Tests\TimeHelper;
+    use \tests\FakerHelper;
+    use \tests\MockHttpHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function loadApplication(): void

diff --git a/tests/controllers/AssetsTest.php b/tests/controllers/AssetsTest.php
@@ -4,8 +4,8 @@
 
 class AssetsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
 
     public function testShowReturnsTheAsset(): void

diff --git a/tests/controllers/BookmarksTest.php b/tests/controllers/BookmarksTest.php
@@ -8,11 +8,11 @@
 
 class BookmarksTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\LoginHelper;
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\LoginHelper;
 
     public function testIndexRendersCorrectly(): void
     {

diff --git a/tests/controllers/CollectionsTest.php b/tests/controllers/CollectionsTest.php
@@ -13,11 +13,11 @@
 
 class CollectionsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
-    use \tests\LoginHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\LoginHelper;
 
     public function testIndexRedirectsToLinks(): void
     {

diff --git a/tests/controllers/DiscoveryTest.php b/tests/controllers/DiscoveryTest.php
@@ -11,10 +11,10 @@
 
 class DiscoveryTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
 
     public function testShowRendersCorrectly(): void
     {

diff --git a/tests/controllers/ExportationsTest.php b/tests/controllers/ExportationsTest.php
@@ -10,11 +10,11 @@
 
 class ExportationsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\LoginHelper;
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\LoginHelper;
 
     #[\PHPUnit\Framework\Attributes\BeforeClass]
     public static function setJobAdapterToDatabase(): void

diff --git a/tests/controllers/FeedsTest.php b/tests/controllers/FeedsTest.php
@@ -10,12 +10,12 @@
 
 class FeedsTest extends \PHPUnit\Framework\TestCase
 {
+    use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
+    use \Minz\Tests\ResponseAsserts;
     use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \tests\LoginHelper;
     use \tests\MockHttpHelper;
-    use \Minz\Tests\ApplicationHelper;
-    use \Minz\Tests\ResponseAsserts;
 
     #[\PHPUnit\Framework\Attributes\Before]
     public function emptyCachePath(): void

diff --git a/tests/controllers/GroupsTest.php b/tests/controllers/GroupsTest.php
@@ -8,11 +8,11 @@
 
 class GroupsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\LoginHelper;
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\LoginHelper;
 
     public function testEditRendersCorrectly(): void
     {

diff --git a/tests/controllers/ImportationsTest.php b/tests/controllers/ImportationsTest.php
@@ -8,11 +8,11 @@
 
 class ImportationsTest extends \PHPUnit\Framework\TestCase
 {
-    use \tests\FakerHelper;
-    use \tests\InitializerHelper;
-    use \tests\LoginHelper;
     use \Minz\Tests\ApplicationHelper;
+    use \Minz\Tests\InitializerHelper;
     use \Minz\Tests\ResponseAsserts;
+    use \tests\FakerHelper;
+    use \tests\LoginHelper;
 
     public function testDeleteDeletesImportationAndRedirects(): void
     {
+67 −31		src/Database.php
+19 −16		src/Tests/InitializerHelper.php
+20 −0		tests/DatabaseTest.php