From ca82392bba75cf852197f93d4084633e062f6a3e Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Fri, 17 Sep 2021 14:39:52 +0200
Subject: [PATCH] Autoload Haanga library
---
classes/Utils.php | 2 --
classes/modules/sparqlFilterModule.php | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/classes/Utils.php b/classes/Utils.php
index 80eda140..73895735 100644
--- a/classes/Utils.php
+++ b/classes/Utils.php
@@ -492,7 +492,6 @@ class Utils
$data = array();
$strippedModelFile = str_replace('endpoint.', '', str_replace('.query', '', $modelFile));
if (!is_dir($modelFile)) {
- require_once __DIR__ . '/../vendor/ubbdst/haanga/lib/Haanga.php';
Haanga::configure(array(
'cache_dir' => $conf['home'] . 'cache/',
'autoescape' => false,
@@ -708,7 +707,6 @@ class Utils
if (isset($lodspk['queryTimes'])) {
$lodspk['queryTimes'] = Convert::array_to_object($lodspk['queryTimes']);
}
- require_once __DIR__ . '/../vendor/ubbdst/haanga/lib/Haanga.php';
$viewAux = explode("/", $view);
$viewFile = array_pop($viewAux);
//$viewFile = $view;
diff --git a/classes/modules/sparqlFilterModule.php b/classes/modules/sparqlFilterModule.php
index 2adcb5e9..657cca08 100644
--- a/classes/modules/sparqlFilterModule.php
+++ b/classes/modules/sparqlFilterModule.php
@@ -2,6 +2,7 @@
namespace uib\ub\loadspeakr\modules;
+use Haanga;
use uib\ub\loadspeakr\Convert;
use uib\ub\loadspeakr\HTTPStatus;
use uib\ub\loadspeakr\Logging;
@@ -46,7 +47,6 @@ class sparqlFilterModule extends abstractModule
$uri = $res;
$queries = $this->getQueries();
$e = $endpoints['local'];
- require_once __DIR__ . '/../../vendor/ubbdst/haanga/lib/Haanga.php';
Haanga::configure(array(
'cache_dir' => $conf['home'] . 'cache/',
'autoescape' => false,
--
GitLab