From c396a50509b13d081a0d8f04ce92f379a57b619c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 22:30:37 +0100 Subject: [PATCH 1/5] Force composer to run as PHP 5.5.9 --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f7ad2915..2e87a7f17 100644 --- a/composer.json +++ b/composer.json @@ -125,7 +125,10 @@ "psr-4": { "Tests\\": "tests/" } }, "config": { - "bin-dir": "bin" + "bin-dir": "bin", + "platform": { + "php": "5.5.9" + } }, "minimum-stability": "dev", "prefer-stable": true From 5e7fdfc8dd4398c11c1e9d242b2a7c3ebba10a39 Mon Sep 17 00:00:00 2001 From: Yuriy Evdokimov Date: Mon, 21 Nov 2016 11:13:40 +0500 Subject: [PATCH 2/5] Fix #2056 update config.yml Resolves refresh token lifetime issue --- app/config/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index ffc3bb77b..ed217eb51 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -193,7 +193,9 @@ fos_oauth_server: auth_code_class: Wallabag\ApiBundle\Entity\AuthCode service: user_provider: fos_user.user_manager - + options: + refresh_token_lifetime: 1209600 + scheb_two_factor: trusted_computer: enabled: true From 05cdd393d8035f2db5b5982cb9bb38832fc35732 Mon Sep 17 00:00:00 2001 From: Yuriy Evdokimov Date: Mon, 21 Nov 2016 11:29:09 +0500 Subject: [PATCH 3/5] wrong spaces --- app/config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index ed217eb51..85383f131 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -193,8 +193,8 @@ fos_oauth_server: auth_code_class: Wallabag\ApiBundle\Entity\AuthCode service: user_provider: fos_user.user_manager - options: - refresh_token_lifetime: 1209600 + options: + refresh_token_lifetime: 1209600 scheb_two_factor: trusted_computer: From f32ff3753434dce8fc47a8f58a2edc3dc0c71e53 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 21 Nov 2016 07:46:46 +0100 Subject: [PATCH 4/5] Lock down PHPUnit for PHP 5.5 Since Composer defined lowest version is now PHP 5.5.9. PHPUnit 5.0 require PHP 5.6. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2e87a7f17..70f5fc99c 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1.1", "sensio/generator-bundle": "^3.0", - "phpunit/phpunit": "~5.0", + "phpunit/phpunit": "~4.0", "symfony/phpunit-bridge": "^3.0", "friendsofphp/php-cs-fixer": "~1.9", "m6web/redis-mock": "^2.0" From 98253436e9bbd2203f05436fd5a19edd30f532b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 21 Nov 2016 09:20:27 +0100 Subject: [PATCH 5/5] Prepare wallabag 2.1.5 :rocket: --- CHANGELOG.md | 5 +++++ app/config/config.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de523f911..ad9164266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Changelog +### 2.1.5 2016/11/21 +- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r) +- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb) +- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb) + ### 2.1.4 2016/11/19 - [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) - [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) diff --git a/app/config/config.yml b/app/config/config.yml index ffc3bb77b..944ae40f5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.2.0-dev + version: 2.1.5 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English'