introduce query-exception

floriansemm · Nov 3, 2016 · 9108d15 · 9108d15
1 parent 1635e35
commit 9108d15
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 9 deletions.
diff --git a/Query/Exception/QueryException.php b/Query/Exception/QueryException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace FS\SolrBundle\Query\Exception;
+
+class QueryException extends \RuntimeException
+{
+
+}
diff --git a/Query/FindByDocumentNameQuery.php b/Query/FindByDocumentNameQuery.php
@@ -2,6 +2,8 @@
 
 namespace FS\SolrBundle\Query;
 
+use FS\SolrBundle\Query\Exception\QueryException;
+
 /**
  * Builds a wildcard query to find all documents
  *
@@ -25,14 +27,14 @@ public function setDocumentName($documentName)
     /**
      * @return string
      *
-     * @throws \RuntimeException if documentName is null
+     * @throws QueryException if documentName is null
      */
     public function getQuery()
     {
         $documentName = $this->documentName;
 
         if ($documentName == null) {
-            throw new \RuntimeException('documentName should not be null');
+            throw new QueryException('documentName should not be null');
         }
 
         $documentLimitation = $this->createFilterQuery('id')->setQuery(sprintf('id:%s_*', $documentName));

diff --git a/Query/FindByIdentifierQuery.php b/Query/FindByIdentifierQuery.php
@@ -2,6 +2,8 @@
 
 namespace FS\SolrBundle\Query;
 
+use FS\SolrBundle\Query\Exception\QueryException;
+
 class FindByIdentifierQuery extends AbstractQuery
 {
     /**
@@ -20,14 +22,14 @@ public function setDocumentKey($documentKey)
     /**
      * @return string
      *
-     * @throws \RuntimeException when id or document_name is null
+     * @throws QueryException when id or document_name is null
      */
     public function getQuery()
     {
         $idField = $this->documentKey;
 
         if ($idField == null) {
-            throw new \RuntimeException('id should not be null');
+            throw new QueryException('id should not be null');
         }
 
         $documentLimitation = $this->createFilterQuery('id')->setQuery(sprintf('id:%s', $idField));

diff --git a/Query/QueryBuilder.php b/Query/QueryBuilder.php
@@ -4,6 +4,7 @@
 
 use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
 use FS\SolrBundle\Doctrine\Mapper\MetaInformationInterface;
+use FS\SolrBundle\Query\Exception\UnknownFieldException;
 use FS\SolrBundle\SolrInterface;
 use Minimalcode\Search\Criteria;
 
@@ -41,7 +42,7 @@ public function where($field)
     {
         $solrField = $this->metaInformation->getField($field);
         if ($solrField === null) {
-            throw new \RuntimeException(sprintf('Field %s does not exists', $field));
+            throw new UnknownFieldException(sprintf('Field %s does not exists', $field));
         }
 
         $fieldName = $solrField->getNameWithAlias();
@@ -64,7 +65,7 @@ public function andWhere($field)
 
         $solrField = $this->metaInformation->getField($field);
         if ($solrField === null) {
-            throw new \RuntimeException(sprintf('Field %s does not exists', $field));
+            throw new UnknownFieldException(sprintf('Field %s does not exists', $field));
         }
 
         $fieldName = $solrField->getNameWithAlias();
@@ -87,7 +88,7 @@ public function orWhere($field)
 
         $solrField = $this->metaInformation->getField($field);
         if ($solrField === null) {
-            throw new \RuntimeException(sprintf('Field %s does not exists', $field));
+            throw new UnknownFieldException(sprintf('Field %s does not exists', $field));
         }
 
         $fieldName = $solrField->getNameWithAlias();

diff --git a/Query/QueryBuilderInterface.php b/Query/QueryBuilderInterface.php
@@ -2,26 +2,34 @@
 
 namespace FS\SolrBundle\Query;
 
+use FS\SolrBundle\Query\Exception\UnknownFieldException;
+
 interface QueryBuilderInterface
 {
     /**
      * @param string $field
      *
      * @return QueryBuilderInterface
+     *
+     * @throws UnknownFieldException if $field does not exists
      */
     public function where($field);
 
     /**
      * @param string $field
      *
      * @return QueryBuilderInterface
+     *
+     * @throws UnknownFieldException if $field does not exists
      */
     public function andWhere($field);
 
     /**
      * @param string $field
      *
      * @return QueryBuilderInterface
+     *
+     * @throws UnknownFieldException if $field does not exists
      */
     public function orWhere($field);
 

diff --git a/Tests/Query/FindByDocumentNameQueryTest.php b/Tests/Query/FindByDocumentNameQueryTest.php
@@ -27,7 +27,7 @@ public function testGetQuery_SearchInAllFields()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException FS\SolrBundle\Query\Exception\QueryException
      * @expectedExceptionMessage documentName should not be null
      */
     public function testGetQuery_DocumentnameMissing()

diff --git a/Tests/Query/FindByIdentifierQueryTest.php b/Tests/Query/FindByIdentifierQueryTest.php
@@ -25,7 +25,7 @@ public function testGetQuery_SearchInAllFields()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException FS\SolrBundle\Query\Exception\QueryException
      * @expectedExceptionMessage id should not be null
      */
     public function testGetQuery_IdMissing()