Merge pull request #5 from minhd/develop

Updated core

Author: minhd

.travis.yml

@@ -4,6 +4,7 @@ branches:
   - staging
 language: php
 php:
+  - 5.5
   - 5.6
   - 7.0
   - hhvm
@@ -17,7 +18,7 @@ before_script:
   - composer dump-autoload --optimize
   - composer solr-get
 script:
-  - phpunit
+  - vendor/bin/phpunit
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

composer.json

@@ -20,7 +20,7 @@
         "symfony/filesystem": "^3.1",
         "symfony/stopwatch": "^3.1",
         "symfony/finder": "^3.1",
-        "illuminate/support": "5.3.0"
+        "illuminate/support": "^5.2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8 || ~5.0",

src/SolrClient.php

@@ -10,7 +10,6 @@
 use MinhD\SolrClient\SolrClientTrait\ManageCollectionTrait;
 use MinhD\SolrClient\SolrClientTrait\ManageSchemaTrait;
 use MinhD\SolrClient\SolrClientTrait\SearchTrait;
-use Symfony\Component\Config\Definition\Exception\Exception;
 
 class SolrClient
 {
@@ -43,8 +42,15 @@ public function __construct(
         $port = 8983,
         $core = 'gettingstarted'
     ) {
-        $this->host = $this->cleanHost($host);
+
+        $host = $this->cleanHost($host);
+        $parts = parse_url($host);
+        $this->host = $parts['scheme'] . "://" . $parts['host'];
+
         $this->port = $port;
+        if (array_key_exists('port', $parts)) {
+            $this->port = $parts['port'];
+        }
 
         $this->client = new HttpClient([
             'base_uri' => $this->getBaseUrl()

src/SolrClientTrait/SearchTrait.php

@@ -50,6 +50,7 @@ public function getSearchParams()
 
     /**
      * @param string $name
+     * @return null
      */
     public function getSearchParam($name)
     {

src/SolrSearchResult.php

@@ -8,6 +8,8 @@ class SolrSearchResult
     private $numFound;
     private $docs;
 
+    private $errorMessage = null;
+
     private $facets = null;
     private $facetFields = null;
 
@@ -35,12 +37,22 @@ public function __construct($payload, SolrClient $client)
 
     /**
      * @param mixed $payload
+     * @throws \Exception
      */
     public function init($payload)
     {
         $this->params = $payload['responseHeader']['params'];
+
+        // error
+        if (!array_key_exists('response', $payload)) {
+            $this->errorMessage = $payload['error']['msg'];
+            return;
+        }
+
+        // numFound
         $this->numFound = $payload['response']['numFound'];
 
+        // facet_counts
         if (array_key_exists('facet_counts', $payload)) {
             $this->facets = $payload['facet_counts'];
             $this->facetFields = [];
@@ -51,6 +63,7 @@ public function init($payload)
             }
         }
 
+        // docs
         $this->docs = [];
         foreach ($payload['response']['docs'] as $doc) {
             $this->docs[] = new SolrDocument($doc);
@@ -117,6 +130,11 @@ public function getDocs($format = 'array')
         return $this->docs;
     }
 
+    public function errored()
+    {
+        return $this->errorMessage != null;
+    }
+
     /**
      * @return mixed
      */
@@ -158,4 +176,12 @@ public function getNextCursorMark()
     {
         return $this->nextCursorMark;
     }
+
+    /**
+     * @return null
+     */
+    public function getErrorMessage()
+    {
+        return $this->errorMessage;
+    }
 }

tests/SolrClientTest.php

@@ -29,6 +29,15 @@ public function it_should_be_able_to_get_base_url()
         $solr = new SolrClient('development.dev/', 8080);
         $solr->setPath('solr2');
         $this->assertEquals('http://development.dev:8080/solr2/', $solr->getBaseUrl());
+
+
+    }
+
+    /** @test **/
+    public function it_should_find_host_with_port()
+    {
+        $solr = new SolrClient('development.dev:8984');
+        $this->assertEquals('http://development.dev:8984/solr/', $solr->getBaseUrl());
     }
 
     /** @test **/

tests/SolrClientTrait/SearchTraitTest.php

@@ -26,6 +26,20 @@ public function it_should_search_correctly()
         $solr->remove([1, 2]);
     }
 
+    /** @test **/
+    public function it_should_handle_error_correctly()
+    {
+        $solr = new SolrClient('localhost', 8983, 'gettingstarted');
+        $solr->setAutoCommit(true);
+
+        $result = $solr->search([
+            'q' => 'Something:bad!- )'
+        ]);
+
+        $this->assertTrue($result->errored());
+        $this->assertNotEmpty($result->getErrorMessage());
+    }
+
     /** @test **/
     public function it_should_search_and_go_next_page()
     {