From ecf100551d603f21ebaa7c601cbd4e8e07f8432c Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sun, 23 Jul 2023 10:04:57 +0200 Subject: [PATCH] document change, raise minimum PHP version to 7.3, remove branch refresh --- .github/workflows/refresh-php8.yml | 37 ------------------------------ CHANGELOG.md | 2 ++ lib/Controller.php | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 .github/workflows/refresh-php8.yml diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml deleted file mode 100644 index 2c00e45e..00000000 --- a/.github/workflows/refresh-php8.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Refresh PHP 8 branch - -on: - push: - branches: [ master ] - schedule: - - cron: '42 2 * * *' - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout php8 branch - uses: actions/checkout@v3 - with: - # directly checkout the php8 branch - ref: php8 - # Number of commits to fetch. 0 indicates all history for all branches and tags. - # Default: 1 - fetch-depth: 0 - - - name: Merge master changes into php8 - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git merge origin/master - - - name: Push new changes - uses: github-actions-x/commit@v2.9 - with: - name: github-actions[bot] - email: 41898282+github-actions[bot]@users.noreply.github.com - github-token: ${{ secrets.GITHUB_TOKEN }} - push-branch: 'php8' - diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e071b05..90067847 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # PrivateBin version history + * **1.6.0 (not yet released)** + * CHANGED: Minimum required PHP version is 7.3, due to upgrading PHPunit (#707) * **1.5.2 (2023-07-09)** * ADDED: Allow AWS SDK to use default credential provider chain for S3Storage (#1070) * CHANGED: Upgrading libraries to: DOMpurify 3.0.4 & jQuery 3.7.0 diff --git a/lib/Controller.php b/lib/Controller.php index 3ab8d7e8..bb5450ca 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -35,7 +35,7 @@ class Controller * * @const string */ - const MIN_PHP_VERSION = '5.6.0'; + const MIN_PHP_VERSION = '7.3.0'; /** * show the same error message if the paste expired or does not exist