From 457594797c07155f5b54fb2995f8b97f24d9c80c Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 9 Aug 2019 22:56:54 +0800 Subject: [PATCH] Increase PHP version requirement --- .circleci/config.yml | 19 +++---------------- README.md | 4 ++-- README_EN.md | 4 ++-- bootstrap/chkenv.php | 6 +++--- composer.json | 2 +- composer.lock | 4 ++-- resources/misc/changelogs/en/next.md | 1 + resources/misc/changelogs/zh_CN/next.md | 1 + tests/UpdateControllerTest.php | 2 +- 9 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 549b4ec7..26913354 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: composer: working_directory: ~/repo docker: - - image: blessingskin/ci:7.1 + - image: blessingskin/ci:7.2 steps: - checkout - restore_cache: @@ -44,17 +44,6 @@ jobs: paths: - . - php7.1: - working_directory: ~/repo - docker: - - image: blessingskin/ci:7.1 - steps: - - attach_workspace: - at: ~/repo - - run: touch storage/testing.sqlite - - run: ./vendor/bin/phpunit --coverage-clover=coverage.xml - - run: bash <(curl -s https://codecov.io/bash) -cF php - php7.2: working_directory: ~/repo docker: @@ -63,7 +52,8 @@ jobs: - attach_workspace: at: ~/repo - run: touch storage/testing.sqlite - - run: ./vendor/bin/phpunit + - run: ./vendor/bin/phpunit --coverage-clover=coverage.xml + - run: bash <(curl -s https://codecov.io/bash) -cF php php7.3: working_directory: ~/repo @@ -81,9 +71,6 @@ workflows: jobs: - frontend - composer - - php7.1: - requires: - - composer - php7.2: requires: - composer diff --git a/README.md b/README.md index 855cf0dc..f20c05c5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Circle CI Status Codecov Latest Stable Version -PHP 7.1.8+ +PHP 7.2.12+ License

@@ -40,7 +40,7 @@ Blessing Skin 是一个开源的 PHP 项目，这意味着您可以自由地在 Blessing Skin 对您的服务器有一定的要求。_在大多数情况下，下列所需的 PHP 扩展已经开启。_ - 一台支持 URL 重写的主机，Nginx、Apache 或 IIS -- **PHP >= 7.1.8** [（服务器不支持？）](https://github.com/bs-community/blessing-skin-server/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E) +- **PHP >= 7.2.12** [（服务器不支持？）](https://github.com/bs-community/blessing-skin-server/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E) - 安装并启用如下 PHP 扩展： - OpenSSL - PDO diff --git a/README_EN.md b/README_EN.md index a127634d..b206ca9e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -7,7 +7,7 @@ Circle CI Status Codecov Latest Stable Version -PHP 7.1.8+ +PHP 7.2.12+ License

@@ -40,7 +40,7 @@ Blessing Skin is an open-source project written in PHP, which means you can depl Blessing Skin has only a few system requirements. _In most cases, these PHP extensions are already enabled._ - Web server with URL rewriting enabled -- **PHP >= 7.1.8** (use v2.x branch if your server doesn't meet the requirements) +- **PHP >= 7.2.12** (use v2.x branch if your server doesn't meet the requirements) - OpenSSL PHP Extension - PDO PHP Extension - Mbstring PHP Extension diff --git a/bootstrap/chkenv.php b/bootstrap/chkenv.php index 21495cbd..b9ad5968 100644 --- a/bootstrap/chkenv.php +++ b/bootstrap/chkenv.php @@ -7,10 +7,10 @@ exit($error); } - if (version_compare(PHP_VERSION, '7.1.8', '<')) { + if (version_compare(PHP_VERSION, '7.2.12', '<')) { die_with_utf8_encoding( - '[Error] Blessing Skin requires PHP version >= 7.1.8, you are now using '.PHP_VERSION.'
'. - '[错误] 你的 PHP 版本过低（'.PHP_VERSION.'），Blessing Skin 要求至少为 7.1.8' + '[Error] Blessing Skin requires PHP version >= 7.2.12, you are now using '.PHP_VERSION.'
'. + '[错误] 你的 PHP 版本过低（'.PHP_VERSION.'），Blessing Skin 要求至少为 7.2.12' ); } diff --git a/composer.json b/composer.json index 714815c4..ca2b99e9 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "A web application brings your custom skins back in offline Minecraft servers.", "license": "MIT", "require": { - "php": ">=7.1.8", + "php": ">=7.2.12", "ext-zip": "*", "ext-openssl": "*", "ext-pdo": "*", diff --git a/composer.lock b/composer.lock index dc354ad5..f808a954 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ad7b77c5a5fbb2add5ab2c9d2b37a8f1", + "content-hash": "eb71fb9d875289395e7b43be6a663b41", "packages": [ { "name": "composer/ca-bundle", @@ -6808,7 +6808,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1.8", + "php": ">=7.2.12", "ext-zip": "*", "ext-openssl": "*", "ext-pdo": "*", diff --git a/resources/misc/changelogs/en/next.md b/resources/misc/changelogs/en/next.md index d01cbf32..17d77150 100644 --- a/resources/misc/changelogs/en/next.md +++ b/resources/misc/changelogs/en/next.md @@ -8,6 +8,7 @@ - Tweaked policy of retrieve CA cert for GuzzleHttp. - Refactor account system. +- PHP version requirement is increased to 7.2.12. ## Fixed diff --git a/resources/misc/changelogs/zh_CN/next.md b/resources/misc/changelogs/zh_CN/next.md index f2011dd1..0d18e5e7 100644 --- a/resources/misc/changelogs/zh_CN/next.md +++ b/resources/misc/changelogs/zh_CN/next.md @@ -8,6 +8,7 @@ - 修改 GuzzleHttp 库获取 CA 证书的策略 - 重构用户系统 +- PHP 版本最低要求为 7.2.12 ## 修复 diff --git a/tests/UpdateControllerTest.php b/tests/UpdateControllerTest.php index 25ce6398..711fd195 100644 --- a/tests/UpdateControllerTest.php +++ b/tests/UpdateControllerTest.php @@ -103,7 +103,7 @@ class UpdateControllerTest extends TestCase { return json_encode(array_merge([ 'spec' => 2, - 'php' => '7.1.8', + 'php' => '7.2.12', 'latest' => $version, 'url' => "https://whatever.test/$version/update.zip", ], $extra));