From 17476f4d8d6eaf03c17870c81181dda337ded844 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 7 Sep 2018 13:56:14 +0200 Subject: [PATCH 1/4] Add missing parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Parameters weren’t passed to the sub function. --- src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 34123eea6..83379998d 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -450,7 +450,7 @@ class EntryRepository extends EntityRepository */ private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc') { - return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId)); + return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction); } /** From 8d109df851c0fe83868cacab58fa6557d99b52b7 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 7 Sep 2018 13:56:35 +0200 Subject: [PATCH 2/4] Jump to the new Scrutinizer PHP analysis engine --- .scrutinizer.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index dee92922a..194297f67 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -26,3 +26,18 @@ tools: checks: php: code_rating: true + +# use the new PHP analysis engine +# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis +build: + nodes: + analysis: + tests: + override: + - php-scrutinizer-run + + dependencies: + override: + - npm install -g 'yarn' + - yarn install --force + - COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist From 4408ebd40a229ce384025b4444c003c5779962a3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 7 Sep 2018 14:09:06 +0200 Subject: [PATCH 3/4] Fix tests --- .../CoreBundle/Controller/EntryControllerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 6a4c775b7..3d599ec8d 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -1325,12 +1325,12 @@ class EntryControllerTest extends WallabagCoreTestCase 'http://www.hao123.com/shequ?__noscript__-=1', 'zh_CN', ], - 'ru_RU' => [ - 'http://netler.ru/ikt/windows-error-reporting.htm', - 'ru_RU', + 'ru' => [ + 'https://www.kp.ru/daily/26879.7/3921982/', + 'ru', ], 'pt_BR' => [ - 'http://precodoscombustiveis.com.br/postos/cidade/4121/pr/maringa', + 'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983', 'pt_BR', ], 'fucked_list_of_languages' => [ From c0b65ad1c982dbc0313a796be59b485223ef7e4f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 7 Sep 2018 14:20:02 +0200 Subject: [PATCH 4/4] Updating node to 6.10 Same as defined in .travis.yml --- package.json | 4 ++-- yarn.lock | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8d856bbb2..ac894e797 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "wallabag", - "version": "2.2.2", + "version": "2.3.3", "description": "wallabag is a self hostable application for saving web pages", "private": true, "directories": { "doc": "docs" }, "engines": { - "node": ">4.8" + "node": ">=6.10" }, "repository": { "type": "git", diff --git a/yarn.lock b/yarn.lock index 1dd45be40..7b62e0f9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2178,6 +2178,10 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +highlight.js@^9.12.0: + version "9.12.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"