From e3c09af353720107e6fbef11a893f570aca4aeb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:25:29 +0200 Subject: [PATCH 1/8] docs: simplify docs --- doc/index.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/index.md b/doc/index.md index 55dc47f0..cc020544 100644 --- a/doc/index.md +++ b/doc/index.md @@ -64,11 +64,6 @@ to take advantage of - when a pure-PHP alternative does not exists *(Android, driver, closed api, enterprise...)* - or simply for the fun of it. -!!! warning - - The freedom allowed by `soluble-japha` is not fit for every scenarios. - Be sure to read the [considerations](#considerations) and [performance](#performance) - sections to learn more. ## Features @@ -122,7 +117,6 @@ All P/R are warmly welcomed. ## License -The MIT License (MIT). Copyright (c) 2013-2020 Vanvelthem Sébastien +Published under the [MIT License](https://github.com/belgattitude/soluble-japha/blob/master/LICENSE.md). Copyright (c) 2013-2020 Vanvelthem Sébastien -See the details [here](https://github.com/belgattitude/soluble-japha/blob/master/LICENSE.txt) From e089c8d0488007be35b22c2de5e857073ac5159a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:28:17 +0200 Subject: [PATCH 2/8] chore(phpstan): fix unescaped char --- phpstan.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon b/phpstan.neon index 968fe16c..81eca916 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -41,7 +41,7 @@ parameters: message: '#should return string(.*) but return statement is missing#' path: src/Soluble/Japha/Bridge/Driver/Pjb62/SocketHandler.php - - message: '#should return int|null but return statement is missing#' + message: '#should return int\|null but return statement is missing#' path: src/Soluble/Japha/Bridge/Driver/Pjb62/HttpTunnelHandler.php - message: '#between 1 and 1 is always false#' From ae55af15aabf5ab4423a9d373e2adb2e0cc785b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:28:50 +0200 Subject: [PATCH 3/8] feat: remove php7.1 support --- .travis.yml | 1 - composer.json | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f9007ca..b17b9494 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ dist: trusty matrix: fast_finish: true include: - - php: 7.1 - php: 7.2 env: - CS_CHECKS=true diff --git a/composer.json b/composer.json index 9a4f49b3..4f5a1984 100644 --- a/composer.json +++ b/composer.json @@ -28,18 +28,18 @@ }, "require": { "ext-xml": "*", - "php": "^7.1", + "php": "^7.2", "psr/log": "^1.0" }, "require-dev" : { "phpunit/phpunit": "^7.5", "friendsofphp/php-cs-fixer": "^2.15", - "monolog/monolog": "^1.0 || ^2.0", + "monolog/monolog": "^2.0", "phpstan/phpstan": "^0.12.9", "phpstan/phpstan-strict-rules": "^0.12", "phpstan/phpstan-phpunit": "^0.12", "belgattitude/pjbserver-tools": "^3.0", - "infection/infection": "^0.13 || ^0.14" + "infection/infection": "^0.14" }, "scripts": { "check": [ From 9e73dc38fca917c2b38f8cab232f5b744ecc14f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:31:26 +0200 Subject: [PATCH 4/8] docs: updated for PHP7.2 --- doc/install_client.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/install_client.md b/doc/install_client.md index 5391fa8d..4863cb88 100644 --- a/doc/install_client.md +++ b/doc/install_client.md @@ -1,11 +1,17 @@ # PHP installation -=== "PHP7.1+" +=== "PHP7.2+" ```bash $ composer require soluble/japha ``` +=== "PHP7.1" + + ```bash + $ composer require "soluble/japha@^2.6.0" + ``` + === "PHP 5.6" *For PHP5.6, use the ^1.0.0 version, BC compat with ^2.0.0.* From 3e9f8e00a24a93b89f5b9f7e18f0b8a62103f9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:32:55 +0200 Subject: [PATCH 5/8] docs(changelog): prep for 2.8.0 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c769cc82..47ce9c1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 2.8.0 (2020-04-10) + +### Removed + +- Drop support for PHP7.1 + +### Improved + +- Doc improvements +- QA, CI fixes + ## 2.7.0 (2019-12-21) ### Added From 22599487c83900aa4eac564bf11e449f42d1ad99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:34:11 +0200 Subject: [PATCH 6/8] docs: quick install fixes --- doc/install_client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install_client.md b/doc/install_client.md index 4863cb88..39753b64 100644 --- a/doc/install_client.md +++ b/doc/install_client.md @@ -9,7 +9,7 @@ === "PHP7.1" ```bash - $ composer require "soluble/japha@^2.6.0" + $ composer require "soluble/japha@^2.7.0" ``` === "PHP 5.6" From 4ab6a60d94c15174fa45f3167c4218054b611817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 15:41:46 +0200 Subject: [PATCH 7/8] remove: remove old doc requirements --- requirements.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index c6f63a35..00000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -# -# Dependencies for documentation -# -mkdocs>=1 -Pygments>=2.2 -pymdown-extensions>=4.11 -mkdocs-material>=4 From 4091fcf77ca6491783b5f4d980ba27765d1e8f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= Date: Fri, 10 Apr 2020 16:33:04 +0200 Subject: [PATCH 8/8] chore(scrutinizer): fix for php7.2 --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index d38b1cb4..e17557aa 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -22,7 +22,7 @@ build: project_setup: override: true environment: - php: 7.1 + php: 7.2 tests: override: ['php-scrutinizer-run']