Moved CrawlerException to Search. Updated code to fit SensioLabs. Fix…

…ed Travis CI.
picamator · Oct 31, 2016 · e6b248b · e6b248b
1 parent 51d7f4c
commit e6b248b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,7 @@ php:
   - "7.0"
 
 before_script:
-  - pecl install mongodb
-  - echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - composer remove mongodb/mongodb
   - composer install
 
 script:

diff --git a/dev/tests/phpunit.xml.dist b/dev/tests/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-         bootstrap="./../../../vendor/autoload.php"
+         bootstrap="./../../vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"

diff --git a/dev/tests/unit/src/Engine/GoogleSearchPlace/Http/CrawlerTest.php b/dev/tests/unit/src/Engine/GoogleSearchPlace/Http/CrawlerTest.php
@@ -76,7 +76,7 @@ public function testGet()
     }
 
     /**
-     * @expectedException \Picamator\PlaceSearchApi\Model\Exception\CrawlerException
+     * @expectedException \Picamator\PlaceSearchApi\Search\Exception\CrawlerException
      */
     public function testFailedHttpStatusGet()
     {
@@ -100,7 +100,7 @@ public function testFailedHttpStatusGet()
     }
 
     /**
-     * @expectedException \Picamator\PlaceSearchApi\Model\Exception\CrawlerException
+     * @expectedException \Picamator\PlaceSearchApi\Search\Exception\CrawlerException
      */
     public function testFailedResultStatusGet()
     {
@@ -135,7 +135,7 @@ public function testFailedResultStatusGet()
     }
 
     /**
-     * @expectedException \Picamator\PlaceSearchApi\Model\Exception\CrawlerException
+     * @expectedException \Picamator\PlaceSearchApi\Search\Exception\CrawlerException
      */
     public function testFailedGet()
     {
@@ -150,7 +150,7 @@ public function testFailedGet()
     }
 
     /**
-     * @expectedException \Picamator\PlaceSearchApi\Model\Exception\CrawlerException
+     * @expectedException \Picamator\PlaceSearchApi\Search\Exception\CrawlerException
      */
     public function testFailedEncodeGet()
     {

diff --git a/dev/tests/unit/src/Engine/GoogleSearchPlace/PlaceRepositoryTest.php b/dev/tests/unit/src/Engine/GoogleSearchPlace/PlaceRepositoryTest.php
@@ -2,7 +2,7 @@
 namespace Picamator\PlaceSearchApi\Tests\Unit\Engine\GoogleSearchPlace;
 
 use Picamator\PlaceSearchApi\Engine\GoogleSearchPlace\PlaceRepository;
-use Picamator\PlaceSearchApi\Model\Exception\CrawlerException;
+use Picamator\PlaceSearchApi\Search\Exception\CrawlerException;
 use Picamator\PlaceSearchApi\Model\Exception\RuntimeException;
 use Picamator\PlaceSearchApi\Tests\Unit\BaseTest;
 

diff --git a/src/App/Service/ServiceProvider.php b/src/App/Service/ServiceProvider.php
@@ -11,7 +11,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -58,7 +57,7 @@ public function boot(Application $app)
             if ($code === 404) {
                 return $errorController->getNotFound($request, $app, $e, $code);
             }
-            
+
             return $errorController->getInternalServer($request, $app, $e, $code);
         });
     }

diff --git a/src/Engine/GoogleSearchPlace/Http/Crawler.php b/src/Engine/GoogleSearchPlace/Http/Crawler.php
@@ -5,7 +5,7 @@
 
 use Picamator\PlaceSearchApi\Search\Api\Http\ClientInterface;
 use Picamator\PlaceSearchApi\Search\Api\Http\CrawlerInterface;
-use Picamator\PlaceSearchApi\Model\Exception\CrawlerException;
+use Picamator\PlaceSearchApi\Search\Exception\CrawlerException;
 use Picamator\PlaceSearchApi\Model\Exception\InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 

diff --git a/src/Engine/GoogleSearchPlace/PlaceRepository.php b/src/Engine/GoogleSearchPlace/PlaceRepository.php
@@ -8,7 +8,7 @@
 use Picamator\PlaceSearchApi\Search\Api\Http\CrawlerInterface;
 use Picamator\PlaceSearchApi\Model\Api\MapperInterface;
 use Picamator\PlaceSearchApi\Model\Api\PlaceRepositoryInterface;
-use Picamator\PlaceSearchApi\Model\Exception\CrawlerException;
+use Picamator\PlaceSearchApi\Search\Exception\CrawlerException;
 use Picamator\PlaceSearchApi\Model\Exception\RepositoryException;
 use Picamator\PlaceSearchApi\Model\Exception\RuntimeException;
 

diff --git a/src/Search/Api/Http/CrawlerInterface.php b/src/Search/Api/Http/CrawlerInterface.php
@@ -15,7 +15,7 @@
      *
      * @return array
      *
-     * @throws CrawlerExceptionException
+     * @throws CrawlerException
      */
     public function get(array $query) : array;
 }
diff --git a/src/Model/Exception/CrawlerException.php → src/Search/Exception/CrawlerException.php b/src/Model/Exception/CrawlerException.php → src/Search/Exception/CrawlerException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Picamator\PlaceSearchApi\Model\Exception;
+namespace Picamator\PlaceSearchApi\Search\Exception;
 
 /**
  * Crawler exception

diff --git a/web/.htaccess b/web/.htaccess