Renamed SearchServices directory to Search

src/Dao/AbstractDao.php

@@ -3,12 +3,12 @@ namespace Szurubooru\Dao;
 use Szurubooru\Dao\EntityConverters\IEntityConverter;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Result;
 
 abstract class AbstractDao implements ICrudDao, IBatchDao
 {

src/Dao/PostDao.php

@@ -7,8 +7,8 @@ use Szurubooru\Dao\UserDao;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
 use Szurubooru\Entities\Post;
-use Szurubooru\SearchServices\Filters\PostFilter;
+use Szurubooru\Search\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
 use Szurubooru\Services\ThumbnailService;
 
 class PostDao extends AbstractDao implements ICrudDao

src/Dao/TagDao.php

@@ -5,8 +5,8 @@ use Szurubooru\Dao\EntityConverters\TagEntityConverter;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
 use Szurubooru\Entities\Tag;
-use Szurubooru\SearchServices\Filters\TagFilter;
+use Szurubooru\Search\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
 
 class TagDao extends AbstractDao implements ICrudDao
 {

src/Routes/Comments/GetComments.php

@@ -2,9 +2,9 @@
 namespace Szurubooru\Routes\Comments;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Filters\PostFilter;
+use Szurubooru\Search\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;

src/Routes/Comments/GetPostComments.php

@@ -2,9 +2,9 @@
 namespace Szurubooru\Routes\Comments;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Filters\CommentFilter;
+use Szurubooru\Search\Filters\CommentFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;

src/Routes/GetHistory.php

@@ -3,7 +3,7 @@ namespace Szurubooru\Routes;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Routes\AbstractRoute;
-use Szurubooru\SearchServices\Parsers\SnapshotSearchParser;
+use Szurubooru\Search\Parsers\SnapshotSearchParser;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\ViewProxies\SnapshotViewProxy;

src/Routes/Posts/GetPosts.php

@@ -3,7 +3,7 @@ namespace Szurubooru\Routes\Posts;
 use Szurubooru\Config;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\PostSearchParser;
+use Szurubooru\Search\Parsers\PostSearchParser;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\ViewProxies\PostViewProxy;

src/Routes/Tags/GetTags.php

@@ -2,7 +2,7 @@
 namespace Szurubooru\Routes\Tags;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\TagSearchParser;
+use Szurubooru\Search\Parsers\TagSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
 use Szurubooru\ViewProxies\TagViewProxy;

src/Routes/Users/GetUser.php

@@ -1,7 +1,7 @@
 <?php
 namespace Szurubooru\Routes\Users;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\UserSearchParser;
+use Szurubooru\Search\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
 use Szurubooru\ViewProxies\UserViewProxy;

src/Routes/Users/GetUsers.php

@@ -3,7 +3,7 @@ namespace Szurubooru\Routes\Users;
 use Szurubooru\Config;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\UserSearchParser;
+use Szurubooru\Search\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
 use Szurubooru\ViewProxies\UserViewProxy;

src/Search/Filters/BasicFilter.php

@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
 
 class BasicFilter implements IFilter
 {

src/Search/Filters/CommentFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class CommentFilter extends BasicFilter implements IFilter
 {

src/Search/Filters/IFilter.php

@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
 
 interface IFilter
 {

src/Search/Filters/PostFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class PostFilter extends BasicFilter implements IFilter
 {

src/Search/Filters/SnapshotFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class SnapshotFilter extends BasicFilter implements IFilter
 {

src/Search/Filters/TagFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class TagFilter extends BasicFilter implements IFilter
 {

src/Search/Filters/UserFilter.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class UserFilter extends BasicFilter implements IFilter
 {

src/Search/Parsers/AbstractSearchParser.php

@@ -1,13 +1,13 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\InputReader;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 abstract class AbstractSearchParser
 {

src/Search/Parsers/PostSearchParser.php

@@ -1,13 +1,13 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\PostFilter;
+use Szurubooru\Search\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\PrivilegeService;
 

src/Search/Parsers/SnapshotSearchParser.php

@@ -1,12 +1,12 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class SnapshotSearchParser extends AbstractSearchParser
 {

src/Search/Parsers/TagSearchParser.php

@@ -1,12 +1,12 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\TagFilter;
+use Szurubooru\Search\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class TagSearchParser extends AbstractSearchParser
 {

src/Search/Parsers/UserSearchParser.php

@@ -1,10 +1,10 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\UserFilter;
+use Szurubooru\Search\Filters\UserFilter;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class UserSearchParser extends AbstractSearchParser
 {

src/Search/Requirements/IRequirementValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 interface IRequirementValue
 {

src/Search/Requirements/Requirement.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class Requirement
 {

src/Search/Requirements/RequirementCompositeValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementCompositeValue implements IRequirementValue
 {

src/Search/Requirements/RequirementRangedValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementRangedValue implements IRequirementValue
 {

src/Search/Requirements/RequirementSingleValue.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementSingleValue implements IRequirementValue
 {

src/Search/Result.php

@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices;
+namespace Szurubooru\Search;
-use Szurubooru\SearchServices\Filters\IFilter;
+use Szurubooru\Search\Filters\IFilter;
 
 class Result
 {

src/Search/Tokens/NamedSearchToken.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Tokens;
+namespace Szurubooru\Search\Tokens;
 
 class NamedSearchToken extends SearchToken
 {

src/Search/Tokens/SearchToken.php

@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Tokens;
+namespace Szurubooru\Search\Tokens;
 
 class SearchToken
 {

src/Services/CommentService.php

@@ -4,7 +4,7 @@ use Szurubooru\Dao\CommentDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Comment;
 use Szurubooru\Entities\Post;
-use Szurubooru\SearchServices\Filters\CommentFilter;
+use Szurubooru\Search\Filters\CommentFilter;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\TimeService;
 use Szurubooru\Validator;

src/Services/HistoryService.php

@@ -3,7 +3,7 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\SnapshotDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\TimeService;
 

src/Services/PostHistoryService.php

@@ -3,9 +3,9 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Post;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\PostSnapshotProvider;
 

src/Services/PostService.php

@@ -11,11 +11,11 @@ use Szurubooru\FormData\PostEditFormData;
 use Szurubooru\FormData\UploadFormData;
 use Szurubooru\Helpers\MimeHelper;
 use Szurubooru\Helpers\TypeHelper;
-use Szurubooru\SearchServices\Filters\PostFilter;
+use Szurubooru\Search\Filters\PostFilter;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\PostHistoryService;
 use Szurubooru\Services\ImageConverter;

src/Services/TagHistoryService.php

@@ -3,9 +3,9 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Tag;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\TagSnapshotProvider;
 

src/Services/TagService.php

@@ -6,7 +6,7 @@ use Szurubooru\Dao\TagDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Tag;
 use Szurubooru\FormData\TagEditFormData;
-use Szurubooru\SearchServices\Filters\TagFilter;
+use Szurubooru\Search\Filters\TagFilter;
 use Szurubooru\Services\TimeService;
 use Szurubooru\Validator;
 

src/Services/UserService.php

@@ -9,7 +9,7 @@ use Szurubooru\FormData\RegistrationFormData;
 use Szurubooru\FormData\UserEditFormData;
 use Szurubooru\Helpers\MimeHelper;
 use Szurubooru\Helpers\EnumHelper;
-use Szurubooru\SearchServices\Filters\UserFilter;
+use Szurubooru\Search\Filters\UserFilter;
 use Szurubooru\Services\EmailService;
 use Szurubooru\Services\PasswordService;
 use Szurubooru\Services\TimeService;

tests/Dao/TagDaoFilterTest.php

@@ -2,11 +2,11 @@
 namespace Szurubooru\Tests\Dao;
 use Szurubooru\Dao\TagDao;
 use Szurubooru\Entities\Tag;
-use Szurubooru\SearchServices\Filters\TagFilter;
+use Szurubooru\Search\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Result;
 use Szurubooru\Tests\AbstractDatabaseTestCase;
 
 final class TagDaoFilterTest extends AbstractDatabaseTestCase

tests/Dao/UserDaoFilterTest.php

@@ -2,8 +2,8 @@
 namespace Szurubooru\Tests\Dao;
 use Szurubooru\Dao\PublicFileDao;
 use Szurubooru\Dao\UserDao;
-use Szurubooru\SearchServices\Filters\UserFilter;
+use Szurubooru\Search\Filters\UserFilter;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Result;
 use Szurubooru\Services\ThumbnailService;
 use Szurubooru\Tests\AbstractDatabaseTestCase;
 

tests/SearchServices/UserSearchParserTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace Szurubooru\Tests\SearchService;
 use \Szurubooru\Helpers\InputReader;
-use \Szurubooru\SearchServices\Filters\UserFilter;
+use \Szurubooru\Search\Filters\UserFilter;
-use \Szurubooru\SearchServices\Parsers\UserSearchParser;
+use \Szurubooru\Search\Parsers\UserSearchParser;
 use \Szurubooru\Tests\AbstractTestCase;
 
 final class UserSearchParserTest extends AbstractTestCase