aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2018-09-07 17:02:39 +0200
committerGitHub <noreply@github.com>2018-09-07 17:02:39 +0200
commit8013f35d96c42b15c1da28cdff40e97289ad4e25 (patch)
treee69798d20213b54b76ee5f95c0ef36ea3bf25cea
parent495f83c92539444bff7dfd6cd647b7d65a74f949 (diff)
parentc0b65ad1c982dbc0313a796be59b485223ef7e4f (diff)
downloadwallabag-8013f35d96c42b15c1da28cdff40e97289ad4e25.tar.gz
wallabag-8013f35d96c42b15c1da28cdff40e97289ad4e25.tar.zst
wallabag-8013f35d96c42b15c1da28cdff40e97289ad4e25.zip
Merge pull request #3719 from wallabag/fix-sort-parameters
Fix sort parameters
-rw-r--r--.scrutinizer.yml15
-rw-r--r--package.json4
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php2
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php8
-rw-r--r--yarn.lock4
5 files changed, 26 insertions, 7 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index dee92922..194297f6 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -26,3 +26,18 @@ tools:
26checks: 26checks:
27 php: 27 php:
28 code_rating: true 28 code_rating: true
29
30# use the new PHP analysis engine
31# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
32build:
33 nodes:
34 analysis:
35 tests:
36 override:
37 - php-scrutinizer-run
38
39 dependencies:
40 override:
41 - npm install -g 'yarn'
42 - yarn install --force
43 - COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist
diff --git a/package.json b/package.json
index 8d856bbb..ac894e79 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
1{ 1{
2 "name": "wallabag", 2 "name": "wallabag",
3 "version": "2.2.2", 3 "version": "2.3.3",
4 "description": "wallabag is a self hostable application for saving web pages", 4 "description": "wallabag is a self hostable application for saving web pages",
5 "private": true, 5 "private": true,
6 "directories": { 6 "directories": {
7 "doc": "docs" 7 "doc": "docs"
8 }, 8 },
9 "engines": { 9 "engines": {
10 "node": ">4.8" 10 "node": ">=6.10"
11 }, 11 },
12 "repository": { 12 "repository": {
13 "type": "git", 13 "type": "git",
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 34123eea..83379998 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -450,7 +450,7 @@ class EntryRepository extends EntityRepository
450 */ 450 */
451 private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc') 451 private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
452 { 452 {
453 return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId)); 453 return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction);
454 } 454 }
455 455
456 /** 456 /**
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 6a4c775b..3d599ec8 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -1325,12 +1325,12 @@ class EntryControllerTest extends WallabagCoreTestCase
1325 'http://www.hao123.com/shequ?__noscript__-=1', 1325 'http://www.hao123.com/shequ?__noscript__-=1',
1326 'zh_CN', 1326 'zh_CN',
1327 ], 1327 ],
1328 'ru_RU' => [ 1328 'ru' => [
1329 'http://netler.ru/ikt/windows-error-reporting.htm', 1329 'https://www.kp.ru/daily/26879.7/3921982/',
1330 'ru_RU', 1330 'ru',
1331 ], 1331 ],
1332 'pt_BR' => [ 1332 'pt_BR' => [
1333 'http://precodoscombustiveis.com.br/postos/cidade/4121/pr/maringa', 1333 'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983',
1334 'pt_BR', 1334 'pt_BR',
1335 ], 1335 ],
1336 'fucked_list_of_languages' => [ 1336 'fucked_list_of_languages' => [
diff --git a/yarn.lock b/yarn.lock
index 1dd45be4..7b62e0f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2178,6 +2178,10 @@ hawk@~3.1.3:
2178 hoek "2.x.x" 2178 hoek "2.x.x"
2179 sntp "1.x.x" 2179 sntp "1.x.x"
2180 2180
2181highlight.js@^9.12.0:
2182 version "9.12.0"
2183 resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
2184
2181hmac-drbg@^1.0.0: 2185hmac-drbg@^1.0.0:
2182 version "1.0.1" 2186 version "1.0.1"
2183 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" 2187 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"