Merge pull request #1267 from NatLibFi/issue1260-reopened-vocabulary-…

…search-using-0-as-the-query-argument-throws-an-error

Fix vocabulary search using "0" as the search string

model/ConceptSearchParameters.php

@@ -67,7 +67,7 @@ public function getArrayClass()
 
     public function getSearchTerm() : string
     {
-        $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query');
+        $term = $this->request->getQueryParamRaw('q') !== null ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query');
         if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest)
             $term = $this->request->getQueryParamRaw('label');
         $term = trim($term); // surrounding whitespace is not considered significant

model/sparql/GenericSparql.php

@@ -980,7 +980,6 @@ protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $p
    }
    $hitgroup
 EOQ;
-
         return $query;
     }
     /**

tests/ConceptSearchParametersTest.php

@@ -86,6 +86,16 @@ public function testGetSearchTerm() {
         $this->assertEquals('test', $params->getSearchTerm());
     }
 
+    /**
+     * @covers ConceptSearchParameters::getSearchTerm
+     * Is created particularly for searches not using REST
+     */
+    public function testSearchTermWithoutRest() {
+        $params = new ConceptSearchParameters($this->request, new GlobalConfig('/../tests/testconfig.ttl'), false);
+        $this->request->method('getQueryParamRaw')->will($this->returnValue('0'));
+        $this->assertEquals('0*', $params->getSearchTerm());
+    }
+
     /**
      * For https://github.com/NatLibFi/Skosmos/issues/1275, to verify
      * that querying for `0` (zero) does not evaluate it as a boolean
@@ -250,4 +260,5 @@ public function testGetAdditionalFields() {
         $params = new ConceptSearchParameters($this->request, new GlobalConfig('/../tests/testconfig.ttl'));
         $this->assertEquals(array('broader', 'prefLabel'), $params->getAdditionalFields());
     }
+
 }

tests/RestControllerTest.php

@@ -315,7 +315,7 @@ public function testSearchJsonLdWithAdditionalFields() {
   /**
    * Data provider for testSearchWithZero test.
    */
-  public function testSearchWithZeroData(): array {
+  public function provideSearchWithZeroData(): array {
     return [
       ['0', true],
       ['1', true],
@@ -328,7 +328,7 @@ public function testSearchWithZeroData(): array {
 
   /**
    * @covers RestController::search
-   * @dataProvider testSearchWithZeroData
+   * @dataProvider provideSearchWithZeroData
    * @param $query string the search query
    * @param $isSuccess bool whether the request must succeed or fail
    */