update

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# End of line reformating
+3daf6593d89c608a6660a6c0b872eeb2607548ba
+# Convert all tabs to spaces
+a4cb0561f627c918cf304663fd32fd2b192f1565
+

.github/workflows/ci.yml

@@ -13,13 +13,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
-        phpunit: ['9']
+        php: ['8.1', '8.2', '8.3', '8.4']
         include:
-        - php: '7.4'
-          phpunit: '8'
-          coverage: xdebug
-          flags: '--coverage-clover clover.xml'
+          - php: '8.1'
+            coverage: xdebug
+            flags: '--coverage-clover clover.xml'
 
     services:
       mysql:
@@ -30,17 +28,19 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: false
           MYSQL_ROOT_PASSWORD: secret
           MYSQL_DATABASE: yourls_tests
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+          MARIADB_MYSQL_LOCALHOST_USER: 1
+          MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE
+        options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
 
     - name: Use PHP ${{ matrix.php }}
-      uses: shivammathur/setup-php@2.24.0
+      uses: shivammathur/setup-php@2.35.5
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, curl, zip, dom, simplexml, intl, pdo_mysql
-        tools: phpunit:${{ matrix.phpunit }}
+        tools: phpunit
         coverage: ${{ matrix.coverage }}
 
     # - name: Validate composer.json and composer.lock
@@ -71,7 +71,6 @@ jobs:
         cp tests/data/config/yourls-tests-config-ci.php user/config.php
 
     - name: Test
-      run: phpunit --configuration phpunit.xml.dist ${{ matrix.flags }}
+      run: phpunit --configuration phpunit.xml.dist --testdox --display-deprecations --display-notices --display-warnings --display-errors ${{ matrix.flags }}
       env:
         DB_PORT: ${{ job.services.mysql.ports['3306'] }}
-

.github/workflows/update-certificates.yml

@@ -13,6 +13,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   certificate-check:
     name: "Check for updated certificate bundle"
@@ -22,7 +26,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
+
+      - name: Generate token
+        uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
 
       - name: Get current certificate bundle
         working-directory: ./includes/vendor/rmccue/requests/certificates
@@ -42,8 +59,11 @@ jobs:
         run: echo "DATE=$(/bin/date -u "+%F")" >> $GITHUB_OUTPUT
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
+        id: pull-request
         with:
+          token: ${{ steps.app-token.outputs.token }}
+          author: "${{ steps.app-token.outputs.app-slug }}[bot] <${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>"
           base: master
           branch: auto-update-cacert
           delete-branch: true
@@ -55,7 +75,17 @@ jobs:
             Source: https://curl.se/docs/caextract.html
           labels: |
             dependencies
-          reviewers: |
-            ozh
-            LeoColomb
-            dgw
+
+      - name: Approve a PR
+        if: ${{ steps.pull-request.outputs.pull-request-url && steps.pull-request.outputs.pull-request-operation != 'none' }}
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ steps.pull-request.outputs.pull-request-url }}
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Enable Pull Request Automerge
+        if: ${{ steps.pull-request.outputs.pull-request-url && steps.pull-request.outputs.pull-request-operation != 'none' }}
+        run: gh pr merge --auto --rebase "$PR_URL"
+        env:
+          PR_URL: ${{ steps.pull-request.outputs.pull-request-url }}
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/update-geoip.yml

@@ -13,21 +13,31 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   update-geoip:
     name: "Check for updated GeoIP DB"
 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Generate token
-        uses: tibdex/github-app-token@v1
-        id: generate-token
+        uses: actions/create-github-app-token@v2
+        id: app-token
         with:
-          app_id: ${{ secrets.BOT_APP_ID }}
-          private_key: ${{ secrets.BOT_PRIVATE_KEY }}
+          app-id: ${{ vars.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
 
       - name: Check if newer GeoIP DB
         env:
@@ -36,12 +46,12 @@ jobs:
           URL="https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${MAXMIND_API_KEY}&suffix=tar.gz"
           REMOTE_MODIFIED=$(curl --silent --head "$URL" | grep "last-modified" | sed 's/last-modified: //')
           REMOTE_CTIME=$(date -d "$REMOTE_MODIFIED" +%s)
-          LOCAL_MODIFIED=$(curl -sL https://api.github.com/repos/YOURLS/YOURLS/commits?path=includes/geo/GeoLite2-Country.mmdb | \
+          LOCAL_MODIFIED=$(curl -fsSL https://api.github.com/repos/YOURLS/YOURLS/commits?path=includes/geo/GeoLite2-Country.mmdb | \
             jq -r '.[0]["commit"]["author"]["date"]')
           LOCAL_CTIME=$(date -d "$LOCAL_MODIFIED" +%s)
           echo "Remote: $REMOTE_CTIME ($(date -d @$REMOTE_CTIME))"
           echo "Local: $LOCAL_CTIME ($(date -d @$LOCAL_CTIME))"
-          if [ $LOCAL_CTIME -lt $REMOTE_CTIME ] ; then curl -s "$URL" | tar -zvx -C includes/geo/ --strip-components 1 -- ; fi
+          if [ $LOCAL_CTIME -lt $REMOTE_CTIME ] ; then curl -fsSL "$URL" | tar -zvx -C includes/geo/ --strip-components 1 -- ; fi
 
       - name: "Debug info: Show git status"
         run: git status -vv --untracked=all
@@ -51,9 +61,11 @@ jobs:
         run: echo "DATE=$(/bin/date -u "+%F")" >> $GITHUB_OUTPUT
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
+        id: pull-request
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ steps.app-token.outputs.token }}
+          author: "${{ steps.app-token.outputs.app-slug }}[bot] <${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>"
           base: master
           branch: auto-update-geoip
           commit-message: "Update GeoIP DB"
@@ -64,3 +76,17 @@ jobs:
             Source: https://www.maxmind.com/en/account/login
           labels: |
             dependencies
+
+      - name: Approve a PR
+        if: ${{ steps.pull-request.outputs.pull-request-url && steps.pull-request.outputs.pull-request-operation != 'none' }}
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ steps.pull-request.outputs.pull-request-url }}
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Enable Pull Request Automerge
+        if: ${{ steps.pull-request.outputs.pull-request-url && steps.pull-request.outputs.pull-request-operation != 'none' }}
+        run: gh pr merge --auto --rebase "$PR_URL"
+        env:
+          PR_URL: ${{ steps.pull-request.outputs.pull-request-url }}
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/update-translations.yml

@@ -0,0 +1,115 @@
+name: Update translations
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  translations-check:
+    name: Check for updated translations
+    if: ${{ github.event_name != 'schedule' || github.repository == 'YOURLS/YOURLS' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install GNU gettext
+        run: sudo apt-get install gettext
+
+      - name: Get version
+        id: get-version
+        run: echo "yourls-version=$(php -r 'require "includes/version.php"; echo YOURLS_VERSION;')" >> $GITHUB_OUTPUT
+
+      - name: Extract translations
+        env:
+          YOURLS_VERSION: ${{ steps.get-version.outputs.yourls-version }}
+        run: |
+          find . -name "*.php" ! -path "./user/*" ! -path "./tests/*" ! -path "./includes/vendor/*" \
+          | xargs xgettext \
+            --output=YOURLS.pot --package-name=YOURLS --package-version=$YOURLS_VERSION --foreign-user \
+            --add-location --language=PHP --from-code=UTF-8 --sort-by-file \
+            --keyword=yourls__ \
+            --keyword=yourls_e \
+            --keyword=yourls_s \
+            --keyword=yourls_se \
+            --keyword=yourls_esc_attr__ \
+            --keyword=yourls_esc_html__ \
+            --keyword=yourls_x \
+            --keyword=yourls_ex \
+            --keyword=yourls_esc_attr_x \
+            --keyword=yourls_esc_html_x \
+            --keyword=yourls_n:1,2 \
+            --keyword=yourls_nx:1,2 \
+            --keyword=yourls_n_noop:1,2 \
+            --keyword=yourls_nx_noop:1,2
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: YOURLS-pot
+          path: YOURLS.pot
+
+  translations-submit:
+    name: Submit updated translations
+    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'YOURLS/YOURLS' }}
+    runs-on: ubuntu-latest
+    needs:
+      - translations-check
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          repository: YOURLS/YOURLS.pot
+
+      - uses: actions/download-artifact@v5
+        with:
+          name: YOURLS-pot
+
+      - name: Generate token
+        uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
+      - name: Get GitHub App User ID
+        id: get-user-id
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+
+      - name: Show git status
+        run: git status -vv --untracked=all
+
+      - name: Get date
+        id: get-date
+        run: echo "DATE=$(/bin/date -u "+%F")" >> $GITHUB_OUTPUT
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7
+        id: pull-request
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          author: "${{ steps.app-token.outputs.app-slug }}[bot] <${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>"
+          base: main
+          branch: auto-update-translations
+          delete-branch: true
+          commit-message: "Update translations"
+          title: "Update translations"
+          body: |
+            Updated translations, last verified on ${{ steps.get-date.outputs.DATE }}.
+          labels: |
+            dependencies
+
+      - name: Enable Pull Request Automerge
+        if: ${{ steps.pull-request.outputs.pull-request-url && steps.pull-request.outputs.pull-request-operation != 'none' }}
+        run: gh pr merge --auto --rebase "$PR_URL"
+        env:
+          PR_URL: ${{ steps.pull-request.outputs.pull-request-url }}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.gitignore

@@ -46,6 +46,8 @@ Thumbs.db
 Desktop.ini
 # Mac crap
 .DS_Store
-# NetBeans files
+# IDE files
 /nbproject/
 .idea
+.vs
+.vscode

CHANGELOG.md

@@ -4,6 +4,34 @@ YOURLS Changelog
 _This file lists the main changes through all versions of YOURLS.  
 For a much more detailed list, simply refer to [commit messages](https://github.com/YOURLS/YOURLS/commits/master)._
 
+1.10.2
+---
+- fixed: `admin/tools.php` now uses `yourls_get_nonce_life()` (#3906)
+- fixed: "Display 1 to 0 of 0 URLs" on admin list page (#3910)
+- fixed: replace deprecated `get_all_options` filter with an action (#3683)
+- fixed: defer loading text domain after plugins (#3679)
+- removed: Gandi references (#3929)
+
+1.10.1
+---
+- fixed: sandbox exceptions when disabling plugins (#3893)
+- fixed: stats date calculation are now correct (#3895)
+- fixed: unexpected warning raised on login page
+- removed: unsupported installation cases with Composer
+
+1.10.0
+---
+- added: Support PHP 8.3 & 8.4
+- removed: Support for PHP prior to 8.1 which is now minimal requirement
+- changed: Ensure all `statusCode`/`errorCode` API values are strings (#3756)
+- fixed: Results with 0 clicks on search (#3589)
+- fixed: Upgrade Aura.SQL to fix PHP 8.4 compatibility (#3852)
+- fixed: login page accessibility (#3660)
+- fixed: MySQL 8+ compatibility (#3828)
+- changed: Upgrade dependencies
+- changed: Update GeoIP DB
+- changed: Update certificates
+
 1.9.2
 ---
 - added: Support PHP 8.2 (#3474)