Merge branch '5.3.x'

phpmyadmin · Aug 23, 2023 · 6eda416 · 6eda416
2 parents 0260e98 + e351036
commit 6eda416
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 153 deletions.
diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml
@@ -11,7 +11,7 @@ jobs:
     lint-php:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: Use php 8.1
               uses: shivammathur/setup-php@v2
               with:
@@ -20,7 +20,7 @@ jobs:
             - name: Validate composer.json and composer.lock
               run: composer validate
             - name: Cache module
-              uses: actions/cache@v2
+              uses: actions/cache@v3
               with:
                   path: ~/.composer/cache/
                   key: composer-cache

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
@@ -11,7 +11,7 @@ jobs:
     lint-docs:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: lint php documentation
               uses: sudo-bot/action-doctum@v5
               with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
                   - { php-version: 'nightly', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-reqs', extensions: 'apcu, mbstring' }
                   - { php-version: 'nightly', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-reqs', extensions: ':apcu, mbstring' }
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               with:
                   # Fetch some commits for Scrutinizer coverage upload
                   fetch-depth: 15
@@ -39,7 +39,7 @@ jobs:
               run: |
                 echo "::set-output name=dir::$(composer config cache-files-dir)"
             - name: Restore cache
-              uses: actions/cache@v2
+              uses: actions/cache@v3
               with:
                 path: ${{ steps.composer-cache.outputs.dir }}
                 key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -50,7 +50,7 @@ jobs:
             - name: Run php tests
               run: composer run phpunit
             - name: Send coverage
-              uses: codecov/codecov-action@v1
+              uses: codecov/codecov-action@v3
               with:
                 flags: unit-${{ matrix.php-version }}-${{ matrix.os }}
                 name: phpunit-${{ matrix.php-version }}-${{ matrix.os }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 * Drop support for PHP 7.1, PHP 7.2, PHP 7.3, PHP 7.4, PHP 8.0.
 
+## [5.3.1] - 2023-08-23
+
+* Add function guards to the global functions (#44)
+
 ## [5.3.0] - 2022-04-26
 
 * Add support for Symfony 6