From 287c3c1cb3b89141cdbdfa0248e51e8cd2ff0f9a Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Tue, 7 Oct 2014 20:58:09 +0200 Subject: [PATCH] Fixed post search parsing --- src/SearchServices/Parsers/AbstractSearchParser.php | 2 +- src/SearchServices/Parsers/PostSearchParser.php | 6 ++++-- src/SearchServices/Parsers/TagSearchParser.php | 3 ++- src/SearchServices/Parsers/UserSearchParser.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/SearchServices/Parsers/AbstractSearchParser.php b/src/SearchServices/Parsers/AbstractSearchParser.php index abd72543..937d9e91 100644 --- a/src/SearchServices/Parsers/AbstractSearchParser.php +++ b/src/SearchServices/Parsers/AbstractSearchParser.php @@ -137,7 +137,7 @@ abstract class AbstractSearchParser } $colonPosition = strpos($tokenText, ':'); - if ($colonPosition !== false and $colonPosition > 0) + if (($colonPosition !== false) and ($colonPosition > 0)) { $searchToken = new \Szurubooru\SearchServices\Tokens\NamedSearchToken(); list ($tokenKey, $tokenValue) = explode(':', $tokenText, 2); diff --git a/src/SearchServices/Parsers/PostSearchParser.php b/src/SearchServices/Parsers/PostSearchParser.php index b02a0058..ef05c931 100644 --- a/src/SearchServices/Parsers/PostSearchParser.php +++ b/src/SearchServices/Parsers/PostSearchParser.php @@ -76,7 +76,8 @@ class PostSearchParser extends AbstractSearchParser $this->decorateFilterFromNamedToken($filter, $token); } - throw new \Szurubooru\NotSupportedException(); + else + throw new \Szurubooru\NotSupportedException(); } protected function getOrderColumn($token) @@ -114,7 +115,8 @@ class PostSearchParser extends AbstractSearchParser elseif ($token === 'fav_time') return \Szurubooru\SearchServices\Filters\PostFilter::ORDER_LAST_FAV_TIME; - throw new \Szurubooru\NotSupportedException(); + else + throw new \Szurubooru\NotSupportedException(); } private function addIdRequirement($filter, $token) diff --git a/src/SearchServices/Parsers/TagSearchParser.php b/src/SearchServices/Parsers/TagSearchParser.php index e24205f6..7dbc274f 100644 --- a/src/SearchServices/Parsers/TagSearchParser.php +++ b/src/SearchServices/Parsers/TagSearchParser.php @@ -32,6 +32,7 @@ class TagSearchParser extends AbstractSearchParser elseif ($token === 'usage_count') return \Szurubooru\SearchServices\Filters\TagFilter::ORDER_USAGE_COUNT; - throw new \Szurubooru\NotSupportedException(); + else + throw new \Szurubooru\NotSupportedException(); } } diff --git a/src/SearchServices/Parsers/UserSearchParser.php b/src/SearchServices/Parsers/UserSearchParser.php index cd6a6daa..98e1c769 100644 --- a/src/SearchServices/Parsers/UserSearchParser.php +++ b/src/SearchServices/Parsers/UserSearchParser.php @@ -26,6 +26,7 @@ class UserSearchParser extends AbstractSearchParser elseif ($token === 'registration_time') return \Szurubooru\SearchServices\Filters\UserFilter::ORDER_REGISTRATION_TIME; - throw new \Szurubooru\NotSupportedException(); + else + throw new \Szurubooru\NotSupportedException(); } }