From dc90eab32bd1912a1541ba238dcd2c34e6171e94 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 21 Nov 2018 21:11:55 +0100 Subject: [PATCH 1/4] Prepare 2.3.4 release --- CHANGELOG.md | 37 +++++++++++++++++++ app/config/wallabag.yml | 2 +- .../Controller/EntryControllerTest.php | 5 +-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73fe67982..eb2c30840 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,42 @@ # Changelog +## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4) + [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4) + +### Fixes + +- Fix image downloading on null image path [#3684](https://github.com/wallabag/wallabag/pull/3684) +- Remove remaining deprecation notices [#3686](https://github.com/wallabag/wallabag/pull/3686) +- Fix mobile viewport on big iframe and video elements [#3683](https://github.com/wallabag/wallabag/pull/3683) +- Autofocus the username field on the login page [#3691](https://github.com/wallabag/wallabag/pull/3691) +- Feature/svg logo [#3692](https://github.com/wallabag/wallabag/pull/3692) +- Fixes a typo [#3702](https://github.com/wallabag/wallabag/pull/3702) +- Update release script [#3705](https://github.com/wallabag/wallabag/pull/3705) +- Removing failing test from Travis [#3707](https://github.com/wallabag/wallabag/pull/3707) +- Replace SO url by lemonde.fr to avoid random failing test [#3685](https://github.com/wallabag/wallabag/pull/3685) +- php-cs-fixer: native_function_invocation [#3716](https://github.com/wallabag/wallabag/pull/3716) +- PHP 7.2 shouldn't fail [#3717](https://github.com/wallabag/wallabag/pull/3717) +- Liberation goes https [#3726](https://github.com/wallabag/wallabag/pull/3726) +- Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters. [#3725](https://github.com/wallabag/wallabag/pull/3725) +- Fix dockerfile php72 [#3734](https://github.com/wallabag/wallabag/pull/3734) +- Fix sort parameters [#3719](https://github.com/wallabag/wallabag/pull/3719) +- Add note on GitHub PR template to auto-close issues [#3763](https://github.com/wallabag/wallabag/pull/3763) +- Fix link to wallabag requirements in documentation [#3766](https://github.com/wallabag/wallabag/pull/3766) +- Update translation when marking as read [#3772](https://github.com/wallabag/wallabag/pull/3772) +- Makefile fixes for non GNU systems [#3706](https://github.com/wallabag/wallabag/pull/3706) +- Card no preview replaced by wallabag logo [#3774](https://github.com/wallabag/wallabag/pull/3774) + +### Changes + +- Propose YunoHost badge for installing [#3678](https://github.com/wallabag/wallabag/pull/3678) +- More robust srcset image attribute handling [#3690](https://github.com/wallabag/wallabag/pull/3690) +- Rename getBuilderByUser and refactor query for untagged entries [#3712](https://github.com/wallabag/wallabag/pull/3712) +- Show tags on non-image gallery preview card [#3743](https://github.com/wallabag/wallabag/pull/3743) +- add manifest.json for android pwa [#3606](https://github.com/wallabag/wallabag/pull/3606) +- Add placeholder image to card-based gallery entries page [#3745](https://github.com/wallabag/wallabag/pull/3745) +- Abort running install and update script if root [#3733](https://github.com/wallabag/wallabag/pull/3733) +- Swap entry url with origin url if graby provides an updated one [#3553](https://github.com/wallabag/wallabag/pull/3553) + ## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3) [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d24769596..6354b22fd 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.3.3 + version: 2.3.4 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index bf0068b4b..479e07000 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -166,9 +166,8 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertSame($this->url, $content->getUrl()); $this->assertContains('Google', $content->getTitle()); $this->assertSame('fr', $content->getLanguage()); - $this->assertSame('2015-03-28 11:43:19', $content->getPublishedAt()->format('Y-m-d H:i:s')); - $this->assertSame('Morgane Tual', $author[0]); - $this->assertArrayHasKey('x-varnish1', $content->getHeaders()); + $this->assertSame('2016-04-07 19:01:35', $content->getPublishedAt()->format('Y-m-d H:i:s')); + $this->assertArrayHasKey('x-frame-options', $content->getHeaders()); $client->getContainer()->get('craue_config')->set('store_article_headers', 0); } From d470f817ac1452260121279a455b697cf881ac96 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 23 Nov 2018 08:50:16 +0100 Subject: [PATCH 2/4] Use new Travis infra --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb4095336..ce50fcc45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,14 @@ language: php services: - - rabbitmq - - redis - -# faster builds on docker-container setup -sudo: false + - rabbitmq + - redis # used for HHVM addons: - apt: - packages: - - tidy + apt: + packages: + - tidy # cache vendor dirs cache: @@ -68,7 +65,7 @@ before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist + - COMPOSER_MEMORY_LIMIT=-1 travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist - echo "travis_fold:start:prepare" - make prepare DB=$DB - echo "travis_fold:end:prepare" From ea60d76e60da4a74493156e43502c0023401391c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 23 Nov 2018 16:04:33 +0100 Subject: [PATCH 3/4] Use latest bridge to avoid PHPUnit break Because branch 4.8 & 5.7 have been removed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9ed91f20d..86241be03 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1", "sensio/generator-bundle": "^3.0", - "symfony/phpunit-bridge": "^3.3", + "symfony/phpunit-bridge": "3.4.x-dev", "friendsofphp/php-cs-fixer": "~2.0", "m6web/redis-mock": "^2.0", "dama/doctrine-test-bundle": "^4.0" From 5a4cbf5b70a6971af7418781293c98136ad93080 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 23 Nov 2018 21:48:35 +0100 Subject: [PATCH 4/4] Create a custom swap to avoid error --- .travis.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce50fcc45..393063439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,14 @@ branches: except: - legacy +before_install: + - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; + +install: + - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi; + - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi; + - if [[ $ASSETS = build ]]; then yarn install; fi; + before_script: - PHP=$TRAVIS_PHP_VERSION - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; @@ -55,17 +63,17 @@ before_script: - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - composer self-update --no-progress - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; - -install: - - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi; - - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi; - - if [[ $ASSETS = build ]]; then yarn install; fi; - -before_install: - - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; + # increase swap to avoid "proc_open(): fork failed - Cannot allocate memory" + # this should be removed when no more PHP 5 build will be defined + - sudo swapon -s + - sudo fallocate -l 4G /swapfile + - sudo chmod 600 /swapfile + - sudo mkswap /swapfile + - sudo swapon /swapfile + - sudo swapon -s script: - - COMPOSER_MEMORY_LIMIT=-1 travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist + - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist - echo "travis_fold:start:prepare" - make prepare DB=$DB - echo "travis_fold:end:prepare"