Merge branch 'develop'

ushahidi · Nov 29, 2017 · 3c802d2 · 3c802d2
2 parents 3b48a50 + b3e5dab
commit 3c802d2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,8 +35,8 @@ install:
 - composer install --no-interaction
 before_script:
 - composer pre-test
-- if [ "${coverage}" == "" ]; then php -S localhost:8000 -t httpdocs httpdocs/index.php & fi
-- if [ "${coverage}" != "" ]; then php -S localhost:8000 -t httpdocs httpdocs/coverage.php & fi
+- if [ "${coverage}" == "" ]; then (cd httpdocs/; php -S localhost:8000 -t . index.php &) fi
+- if [ "${coverage}" != "" ]; then (cd httpdocs/; php -S localhost:8000 -t . coverage.php &) fi
 - mysql -e 'SET @@GLOBAL.wait_timeout=1800'
 script:
 - if [ "${coverage}" == "" ]; then composer test; fi

diff --git a/application/classes/Ushahidi/Repository/Post.php b/application/classes/Ushahidi/Repository/Post.php
@@ -19,7 +19,6 @@
 use Ushahidi\Core\Entity\PostLockRepository;
 use Ushahidi\Core\Entity\PostValueContainer;
 use Ushahidi\Core\Entity\PostRepository;
-use Ushahidi\Core\Entity\PostSearchData;
 use Ushahidi\Core\Entity\UserRepository;
 use Ushahidi\Core\SearchData;
 use Ushahidi\Core\Usecase\Post\StatsPostRepository;

diff --git a/application/classes/Ushahidi/Validator/Post/Create.php b/application/classes/Ushahidi/Validator/Post/Create.php
@@ -18,7 +18,6 @@
 use Ushahidi\Core\Entity\PostRepository;
 use Ushahidi\Core\Entity\RoleRepository;
 use Ushahidi\Core\Entity\PostLockRepository;
-use Ushahidi\Core\Entity\PostSearchData;
 use Ushahidi\Core\Tool\Validator;
 use Ushahidi\Core\Traits\UserContext;
 use Ushahidi\Core\Tool\Permissions\AclTrait;

diff --git a/src/Core/Entity/PostSearchData.php b/src/Core/Entity/PostSearchData.php
diff --git a/src/Core/Usecase/Form/SearchFormData.php b/src/Core/Usecase/Form/SearchFormData.php