Make ServiceModuleTest pass

- Make sure Utils::queryFile called from Utils also pass in loadspk settings
since global call is removed.
- Improve ServiceModule guards. Make sure it correctly returns false early.

classes/Utils.php

@@ -498,9 +498,9 @@ final class Utils
                             $f[$strippedModelDir] = array();
                         }
 
-                        Utils::queryFile($modelFile, $e, $r[$strippedModelDir], $f);
+                        Utils::queryFile($modelFile, $e, $r[$strippedModelDir], $f, $lodspk);
                     } else {
-                        Utils::queryFile($modelFile, $e, $r, $f);
+                        Utils::queryFile($modelFile, $e, $r, $f, $lodspk);
                     }
                 }
             }

classes/modules/ServiceModule.php

@@ -98,16 +98,19 @@ final class ServiceModule implements ModuleInterface
         $lodspk = $this->configuration->getConfigValue('bootstrap', 'lodspk');
 
         $q = preg_replace('|^' . $conf['basedir'] . '|', '', $localUri);
-        $qArr = explode('/', $q);
 
-        if (sizeof($qArr) == 0) {
+        if ($q === 0 || $q === "") {
             return false;
         }
 
+        $tokens = explode('/', $q);
+
+        if (count($tokens) === 0) {
+            return false;
+        }
 
         $extension = Utils::getExtension($acceptContentType, $conf['http_accept']);
         $viewFile = null;
-        $tokens = $qArr;
         $arguments = array();
 
         while (sizeof($tokens) > 0) {

tests/uib/ub/loadspeakr/modules/ServiceModuleTest.php

@@ -4,6 +4,7 @@ namespace uib\ub\loadspeakr\modules;
 
 use PHPUnit\Framework\TestCase;
 use uib\ub\loadspeakr\Configuration;
+use uib\ub\loadspeakr\Endpoint;
 use uib\ub\loadspeakr\Utils;
 
 require_once __DIR__ . '/../../../../../common.inc.php';
@@ -16,7 +17,7 @@ class ServiceModuleTest extends TestCase
     {
         parent::setUp();
         global $conf;
-        $conf['basedir'] = 'https://example.com';
+        $conf['basedir'] = 'https://example.com/';
         $conf['root'] = 'home';
         $lodspk = [
           'view' => '',
@@ -26,27 +27,25 @@ class ServiceModuleTest extends TestCase
 
         $boostrapConfig = [
           'localUri' => '',
-          'uri' => '',
-          'acceptContentType' => '',
-          'endpoints' => '',
+          'uri' => 'https://example.combar.jpg',
+          'acceptContentType' => 'text/html',
+          'endpoints' => [],
           'extension' => [],
           'lodspk' => $lodspk,
         ];
 
+        $boostrapConfig['endpoints']['local'] = new Endpoint('https://sparql.ub.uib.no/sparql/query', []);
         $configuration = new Configuration($conf);
         $modulesConfig = $configuration->add('bootstrap', $boostrapConfig);
         $this->service = new ServiceModule($modulesConfig, new Utils($modulesConfig));
     }
 
-    public function testMatch(): void
+    /**
+     * @covers \uib\ub\loadspeakr\modules\ServiceModule::match
+     */
+    public function testMatchGuards(): void
     {
-        $uri = 'bar';
-
-        self::assertSame(
-          'foo',
-          $this->service->match($uri),
-          'Failed matching '
-        );
+        self::assertFalse($this->service->match('bar'), 'Failed matching');
     }
 
 }