From 0f837e41fb51fa92767927116dcac7dcc2b72c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:01:29 +0200 Subject: [PATCH 01/19] Fix workflow Add check for vendor/autoload.php in CI workflow --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c48b03b..a7dbb5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,7 @@ jobs: git clone https://github.com/ozh/YOURLS-fr_FR.git user/languages/fr cp user/languages/fr/fr_FR.* user/languages cp tests/data/config/yourls-tests-config-ci.php user/config.php + test -f includes/vendor/autoload.php || { echo "vendor/autoload.php missing from YOURLS checkout"; exit 1; } - name: Drop in db.php run: cp yourls-postgresql/db.php yourls/user/db.php From 67cff5d9fa7332459737b509dd834d6bbc496cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:05:32 +0200 Subject: [PATCH 02/19] cd yourls --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7dbb5d..bbd26b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,22 +64,22 @@ jobs: git clone https://github.com/ozh/YOURLS-fr_FR.git user/languages/fr cp user/languages/fr/fr_FR.* user/languages cp tests/data/config/yourls-tests-config-ci.php user/config.php - test -f includes/vendor/autoload.php || { echo "vendor/autoload.php missing from YOURLS checkout"; exit 1; } - name: Drop in db.php run: cp yourls-postgresql/db.php yourls/user/db.php - name: Run YOURLS test suite working-directory: yourls - run: >- - phpunit - --configuration phpunit.xml.dist - --display-skipped - --display-incomplete - --display-deprecations - --display-notices - --display-warnings - --display-errors + run: | + cd yourls + phpunit \ + --configuration phpunit.xml.dist \ + --display-skipped \ + --display-incomplete \ + --display-deprecations \ + --display-notices \ + --display-warnings \ + --display-errors env: DB_HOST: 127.0.0.1 DB_PORT: ${{ job.services.postgres.ports['5432'] }} From 7e769d94f3fa677ea50c276d2d18ebcc7a232d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:08:23 +0200 Subject: [PATCH 03/19] debug paths step --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbd26b7..5aa1418 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,12 @@ jobs: - name: Drop in db.php run: cp yourls-postgresql/db.php yourls/user/db.php + - name: Debug paths + run: | + pwd + ls -la + ls -la yourls/ || echo "no yourls/ here" + - name: Run YOURLS test suite working-directory: yourls run: | From 82600dd6683569d70a9a49586c0b51d1fe41b757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:15:43 +0200 Subject: [PATCH 04/19] more debug --- .github/workflows/ci.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5aa1418..88aa112 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,10 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.1', '8.5'] - postgres: ['16', '17', '18'] + # php: ['8.1', '8.5'] + # postgres: ['16', '17', '18'] + php: ['8.5'] + postgres: ['16'] services: postgres: @@ -68,15 +70,11 @@ jobs: - name: Drop in db.php run: cp yourls-postgresql/db.php yourls/user/db.php - - name: Debug paths - run: | - pwd - ls -la - ls -la yourls/ || echo "no yourls/ here" - - name: Run YOURLS test suite - working-directory: yourls run: | + pwd + ls -lA + ls -lA yourls/user cd yourls phpunit \ --configuration phpunit.xml.dist \ From 75a01ca9eb6950edfda0fc85e0eab083c82b99d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:25:45 +0200 Subject: [PATCH 05/19] more fix --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88aa112..5a7a366 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,6 @@ jobs: with: repository: YOURLS/YOURLS ref: master - path: yourls - name: Use PHP ${{ matrix.php }} uses: shivammathur/setup-php@v2 @@ -68,7 +67,7 @@ jobs: cp tests/data/config/yourls-tests-config-ci.php user/config.php - name: Drop in db.php - run: cp yourls-postgresql/db.php yourls/user/db.php + run: cp yourls-postgresql/db.php user/db.php - name: Run YOURLS test suite run: | From 96d2b185a1f55d3d64bdff6e039b6268140dc32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:28:45 +0200 Subject: [PATCH 06/19] more fix --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a7a366..9fa4a64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,6 @@ jobs: steps: - name: Checkout yourls-postgresql uses: actions/checkout@v6 - with: - path: yourls-postgresql - name: Checkout YOURLS master uses: actions/checkout@v6 @@ -60,21 +58,19 @@ jobs: coverage: none - name: Prepare YOURLS test environment - working-directory: yourls run: | git clone https://github.com/ozh/YOURLS-fr_FR.git user/languages/fr cp user/languages/fr/fr_FR.* user/languages cp tests/data/config/yourls-tests-config-ci.php user/config.php - name: Drop in db.php - run: cp yourls-postgresql/db.php user/db.php + run: mv db.php user/db.php - name: Run YOURLS test suite run: | pwd ls -lA - ls -lA yourls/user - cd yourls + ls -lA user phpunit \ --configuration phpunit.xml.dist \ --display-skipped \ From 0c7914f0285fc3c3b82b801fc36c7a2e6b17ee45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:31:27 +0200 Subject: [PATCH 07/19] more fix --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fa4a64..891937b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,13 +64,18 @@ jobs: cp tests/data/config/yourls-tests-config-ci.php user/config.php - name: Drop in db.php - run: mv db.php user/db.php + run: | + pwd + ls -lA + ls -lA user + mv db.php user/db.php - name: Run YOURLS test suite run: | pwd ls -lA ls -lA user + ls -lA tests phpunit \ --configuration phpunit.xml.dist \ --display-skipped \ From 497d88dabc2744ffa24a06fcb0c0c5b2efe713da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 17:36:07 +0200 Subject: [PATCH 08/19] still fixing --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 891937b..85ad910 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,15 +40,17 @@ jobs: --health-retries=5 steps: - - name: Checkout yourls-postgresql - uses: actions/checkout@v6 - - name: Checkout YOURLS master uses: actions/checkout@v6 with: repository: YOURLS/YOURLS ref: master + - name: Checkout yourls-postgresql + uses: actions/checkout@v6 + with: + path: yourls-postgresql + - name: Use PHP ${{ matrix.php }} uses: shivammathur/setup-php@v2 with: @@ -68,7 +70,7 @@ jobs: pwd ls -lA ls -lA user - mv db.php user/db.php + mv yourls-postgresql/db.php user/db.php - name: Run YOURLS test suite run: | From 4f8e4b3c6b8e611dd11f13d17437f07087cfdbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 18:41:52 +0200 Subject: [PATCH 09/19] Update PostgreSQL user and simplify CI steps --- .github/workflows/ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85ad910..6de445d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: ports: - 5432/tcp env: - POSTGRES_USER: yourls + POSTGRES_USER: root POSTGRES_PASSWORD: secret POSTGRES_DB: yourls_tests options: >- @@ -66,18 +66,11 @@ jobs: cp tests/data/config/yourls-tests-config-ci.php user/config.php - name: Drop in db.php - run: | - pwd - ls -lA - ls -lA user - mv yourls-postgresql/db.php user/db.php + run: mv yourls-postgresql/db.php user/db.php - name: Run YOURLS test suite run: | - pwd - ls -lA ls -lA user - ls -lA tests phpunit \ --configuration phpunit.xml.dist \ --display-skipped \ From 83ff7898c5222c75cd9acc79edbdeca29ab7b490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 18:50:45 +0200 Subject: [PATCH 10/19] Change DB_USER from 'yourls' to 'root' --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6de445d..f129a4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,6 @@ jobs: env: DB_HOST: 127.0.0.1 DB_PORT: ${{ job.services.postgres.ports['5432'] }} - DB_USER: yourls + DB_USER: root DB_PASSWORD: secret DB_NAME: yourls_tests From d52219bb4a478477291653df0d0240ee281ec46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 18:54:04 +0200 Subject: [PATCH 11/19] less env --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f129a4c..9e52c33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,8 +80,4 @@ jobs: --display-warnings \ --display-errors env: - DB_HOST: 127.0.0.1 DB_PORT: ${{ job.services.postgres.ports['5432'] }} - DB_USER: root - DB_PASSWORD: secret - DB_NAME: yourls_tests From 343b91c5b6449e37d03401d87677987d53f1d6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Thu, 14 May 2026 19:04:17 +0200 Subject: [PATCH 12/19] check env --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e52c33..90243c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,7 @@ jobs: - name: Run YOURLS test suite run: | ls -lA user + env phpunit \ --configuration phpunit.xml.dist \ --display-skipped \ From 30d644632906d217dc6d4b79d7e9bd29d5924cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 14:45:37 +0200 Subject: [PATCH 13/19] check xml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90243c5..fa5a2c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: - name: Run YOURLS test suite run: | ls -lA user - env + cat phpunit.xml.dist phpunit \ --configuration phpunit.xml.dist \ --display-skipped \ From 229a9236e5ba25b74397ff5370ba20932481b5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:03:22 +0200 Subject: [PATCH 14/19] Add var_dump REQUEST --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa5a2c8..daac876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,9 +71,11 @@ jobs: - name: Run YOURLS test suite run: | ls -lA user - cat phpunit.xml.dist + ls -l "$GITHUB_WORKSPACE/phpunit.xml.dist" + cat "$GITHUB_WORKSPACE/phpunit.xml.dist" + echo 'var_dump($_REQUEST); ' >> tests/bootstrap.php phpunit \ - --configuration phpunit.xml.dist \ + --configuration "$GITHUB_WORKSPACE/phpunit.xml.dist" \ --display-skipped \ --display-incomplete \ --display-deprecations \ From c53bfd8719dedfd2538994906618f76c56ddc4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:14:00 +0200 Subject: [PATCH 15/19] More request --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daac876..aaa2efd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,6 +74,8 @@ jobs: ls -l "$GITHUB_WORKSPACE/phpunit.xml.dist" cat "$GITHUB_WORKSPACE/phpunit.xml.dist" echo 'var_dump($_REQUEST); ' >> tests/bootstrap.php + echo 'assertTrue(true); } }' > tests/tests/DumpRequest.php + phpunit --configuration "$GITHUB_WORKSPACE/phpunit.xml.dist" --filter testDump phpunit \ --configuration "$GITHUB_WORKSPACE/phpunit.xml.dist" \ --display-skipped \ From be9ef9f67f0ffdafddd805939077e06caa1f4864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:20:44 +0200 Subject: [PATCH 16/19] php -i --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaa2efd..508718f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,7 @@ jobs: - name: Run YOURLS test suite run: | + php -i | grep -i -E 'variables_order|request_order|register_argc_argv|auto_globals' ls -lA user ls -l "$GITHUB_WORKSPACE/phpunit.xml.dist" cat "$GITHUB_WORKSPACE/phpunit.xml.dist" From 6526d330d63f0c8c7d92238d3a3d9b2b5cece4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:25:51 +0200 Subject: [PATCH 17/19] Update PHP setup action to version 2.37.1 --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 508718f..1cfc7d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,12 +52,11 @@ jobs: path: yourls-postgresql - name: Use PHP ${{ matrix.php }} - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@2.37.1 with: php-version: ${{ matrix.php }} extensions: mbstring, curl, zip, dom, simplexml, intl, pdo_pgsql tools: phpunit - coverage: none - name: Prepare YOURLS test environment run: | From 6b2268b7a4436e21dddcaf7a019bf0a85db6df98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:29:06 +0200 Subject: [PATCH 18/19] fixed ? --- .github/workflows/ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1cfc7d2..3c1da0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,15 +69,9 @@ jobs: - name: Run YOURLS test suite run: | - php -i | grep -i -E 'variables_order|request_order|register_argc_argv|auto_globals' - ls -lA user - ls -l "$GITHUB_WORKSPACE/phpunit.xml.dist" - cat "$GITHUB_WORKSPACE/phpunit.xml.dist" - echo 'var_dump($_REQUEST); ' >> tests/bootstrap.php - echo 'assertTrue(true); } }' > tests/tests/DumpRequest.php - phpunit --configuration "$GITHUB_WORKSPACE/phpunit.xml.dist" --filter testDump + ls -L user/db.php phpunit \ - --configuration "$GITHUB_WORKSPACE/phpunit.xml.dist" \ + --configuration phpunit.xml.dist \ --display-skipped \ --display-incomplete \ --display-deprecations \ From 41344a3f31e9cd2509a6f907bcd73f6d1379a1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=BE=85=E0=BC=BB=20=C7=AC=C9=80=C4=A7=20=E0=BC=84?= =?UTF-8?q?=E0=BC=86=E0=BD=89?= Date: Fri, 15 May 2026 16:31:32 +0200 Subject: [PATCH 19/19] fixed ! :) --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c1da0d..fe38b26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,8 @@ jobs: strategy: fail-fast: false matrix: - # php: ['8.1', '8.5'] - # postgres: ['16', '17', '18'] php: ['8.5'] - postgres: ['16'] + postgres: ['16', '17', '18'] services: postgres: @@ -64,7 +62,7 @@ jobs: cp user/languages/fr/fr_FR.* user/languages cp tests/data/config/yourls-tests-config-ci.php user/config.php - - name: Drop in db.php + - name: User PostgreSQL DB engine run: mv yourls-postgresql/db.php user/db.php - name: Run YOURLS test suite