Switch to GitHub Actions CI

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php_version: [7.2, 7.3, 7.4]
+      fail-fast: false
+
+    steps:
+    - name: Check out repository code
+      uses: actions/checkout@v2
+
+    - name: Cache Fuseki installation
+      uses: actions/cache@v2
+      with:
+        path: tests/apache-jena-fuseki-*
+        key: fuseki-${{ hashFiles('tests/init_fuseki.sh') }}
+
+    - name: Start up Fuseki
+      run: cd tests; sh ./init_fuseki.sh
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@v2
+      with:
+        path: |
+          /tmp/composer-cache
+          vendor
+        key: ${{ runner.os }}-php${{ matrix.php_version}}-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          ${{ runner.os }}-php${{ matrix.php_version}}-
+
+    - name: Install Composer dependencies
+      uses: php-actions/composer@v5
+      with:
+        php_version: ${{ matrix.php_version }}
+        php_extensions: gettext intl xsl pcov
+
+    - name: Run PHPUnit tests
+      uses: osma/phpunit@v2-network-host-debug
+      with:
+        version: 8.5
+        php_version: ${{ matrix.php_version }}
+        php_extensions: gettext intl xsl pcov
+        memory_limit: 512M
+
+    - name: Publish code coverage to Code Climate
+      uses: paambaati/codeclimate-action@v2.7.5
+      env:
+        CC_TEST_REPORTER_ID: fb98170a5c7ea9cc2bbab19ff26268335e6a11a4f8267ca935e5e8ff4624886c
+      with:
+        prefix: /app
+
+    - name: Publish code coverage to Codecov
+      uses: codecov/codecov-action@v1

composer.json

@@ -87,5 +87,8 @@
   },
   "autoload": {
     "classmap": ["controller/", "model/", "model/sparql/"]
+  },
+  "scripts": {
+    "test": "vendor/bin/phpunit"
   }
 }

model/GlobalConfig.php

@@ -189,6 +189,8 @@ public function getDefaultEndpoint()
         $endpoint = $this->resource->get('skosmos:sparqlEndpoint');
         if ($endpoint) {
             return $endpoint->getUri();
+        } elseif (getenv('SKOSMOS_SPARQL_ENDPOINT')) {
+            return getenv('SKOSMOS_SPARQL_ENDPOINT');
         } else {
             return 'http://localhost:3030/ds/sparql';
         }

model/Vocabulary.php

@@ -31,7 +31,14 @@ public function getConfig()
      */
     public function getEndpoint()
     {
-        return $this->resource->get('void:sparqlEndpoint')->getUri();
+        $endpoint = $this->resource->get('void:sparqlEndpoint');
+        if ($endpoint) {
+            return $endpoint->getUri();
+        } elseif (getenv('SKOSMOS_SPARQL_ENDPOINT')) {
+            return getenv('SKOSMOS_SPARQL_ENDPOINT');
+        } else {
+            return 'http://localhost:3030/ds/sparql';
+        }
     }
 
     /**

tests/GenericSparqlTest.php

@@ -17,22 +17,23 @@ protected function setUp() : void
     $this->vocab = $this->model->getVocabulary('test');
     $this->graph = $this->vocab->getGraph();
     $this->params = $this->getMockBuilder('ConceptSearchParameters')->disableOriginalConstructor()->getMock();
-    $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model);
+    $this->endpoint = getenv('SKOSMOS_SPARQL_ENDPOINT');
+    $this->sparql = new GenericSparql($this->endpoint, $this->graph, $this->model);
   }
 
   /**
    * @covers GenericSparql::__construct
    */
   public function testConstructor() {
-    $gs = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model);
+    $gs = new GenericSparql($this->endpoint, $this->graph, $this->model);
     $this->assertInstanceOf('GenericSparql', $gs);
   }
 
   /**
    * @covers GenericSparql::getGraph
    */
   public function testGetGraph() {
-    $gs = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model);
+    $gs = new GenericSparql($this->endpoint, $this->graph, $this->model);
     $this->assertEquals($this->graph, $gs->getGraph());
   }
 
@@ -200,7 +201,7 @@ public function testQueryConceptsAlphabeticalLimitAndOffset() {
   public function testQualifiedNotationAlphabeticalList() {
     $voc = $this->model->getVocabulary('test-qualified-notation');
     $res = new EasyRdf\Resource("http://www.w3.org/2004/02/skos/core#notation");
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $voc->getGraph(), $this->model);
+    $sparql = new GenericSparql($this->endpoint, $voc->getGraph(), $this->model);
 
     $actual = $sparql->queryConceptsAlphabetical("a", "en", null, null, null, false, $res);
 
@@ -271,7 +272,7 @@ public function testQualifiedNotationAlphabeticalList() {
   public function testQualifiedBroaderAlphabeticalList() {
     $voc = $this->model->getVocabulary('test-qualified-broader');
     $res = new EasyRdf\Resource("http://www.w3.org/2004/02/skos/core#broader");
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $voc->getGraph(), $this->model);
+    $sparql = new GenericSparql($this->endpoint, $voc->getGraph(), $this->model);
 
     $actual = $sparql->queryConceptsAlphabetical("a", "en", null, null, null, false, $res);
 
@@ -391,7 +392,7 @@ public function testQueryConceptsAlphabeticalFull() {
    */
   public function testQueryConceptInfoWithMultipleVocabs()
   {
-    $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model);
+    $this->sparql = new GenericSparql($this->endpoint, '?graph', $this->model);
     $voc2 = $this->model->getVocabulary('test');
     $voc3 = $this->model->getVocabulary('dates');
     $voc4 = $this->model->getVocabulary('groups');
@@ -413,7 +414,7 @@ public function testQueryConceptInfoWithMultipleVocabs()
    */
   public function testQueryConceptInfoWithAllVocabs()
   {
-    $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model);
+    $this->sparql = new GenericSparql($this->endpoint, '?graph', $this->model);
     $actual = $this->sparql->queryConceptInfo(array('http://www.skosmos.skos/test/ta121', 'http://www.skosmos.skos/groups/ta111'), null, null, 'en');
     $this->assertInstanceOf('Concept', $actual[0]);
     $this->assertEquals('http://www.skosmos.skos/test/ta121', $actual[0]->getUri());
@@ -490,7 +491,7 @@ public function testQueryConceptScheme()
   {
     $actual = $this->sparql->queryConceptScheme('http://www.skosmos.skos/test/conceptscheme');
     $this->assertInstanceOf('EasyRdf\Graph', $actual);
-    $this->assertEquals('http://localhost:13030/skosmos-test/sparql', $actual->getUri());
+    $this->assertEquals($this->endpoint, $actual->getUri());
   }
 
   /**
@@ -514,7 +515,7 @@ public function testQueryConceptSchemes()
    */
   public function testQueryConceptSchemesSubject()
   {
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', 'http://www.skosmos.skos/test-concept-schemes/', $this->model);
+      $sparql = new GenericSparql($this->endpoint, 'http://www.skosmos.skos/test-concept-schemes/', $this->model);
 
       $actual = $sparql->queryConceptSchemes('en');
       $expected = array(
@@ -566,7 +567,7 @@ public function testQueryConceptsMultipleVocabs()
     $voc2 = $this->model->getVocabulary('groups');
     $this->params->method('getSearchTerm')->will($this->returnValue('Carp'));
     $this->params->method('getVocabs')->will($this->returnValue(array($voc, $voc2)));
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model);
+    $sparql = new GenericSparql($this->endpoint, '?graph', $this->model);
     $actual = $sparql->queryConcepts(array($voc, $voc2), null, null, $this->params);
     $this->assertEquals(2, sizeof($actual));
     $this->assertEquals('http://www.skosmos.skos/groups/ta112', $actual[0]['uri']);
@@ -589,7 +590,7 @@ public function testQueryConceptsMultipleSchemes()
       // returns 3 concepts without the scheme limit, and only 2 with the scheme limit below
       $this->params->method('getSearchTerm')->will($this->returnValue('concept*'));
       $this->params->method('getSchemeLimit')->will($this->returnValue(array('http://www.skosmos.skos/multiple-schemes/cs1', 'http://www.skosmos.skos/multiple-schemes/cs2')));
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', 'http://www.skosmos.skos/multiple-schemes/', $this->model);
+      $sparql = new GenericSparql($this->endpoint, 'http://www.skosmos.skos/multiple-schemes/', $this->model);
       $actual = $sparql->queryConcepts(array($voc), null, null, $this->params);
       $this->assertEquals(2, sizeof($actual));
       $this->assertEquals('http://www.skosmos.skos/multiple-schemes/c1-in-cs1', $actual[0]['uri']);
@@ -1050,7 +1051,7 @@ public function testListConceptGroups()
   {
     $voc = $this->model->getVocabulary('groups');
     $graph = $voc->getGraph();
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
     $actual = $sparql->ListConceptGroups('http://www.w3.org/2004/02/skos/core#Collection', 'en');
     $expected = array (0 => array ('prefLabel' => 'Fish', 'uri' => 'http://www.skosmos.skos/groups/fish', 'hasMembers' => true, 'childGroups' => array('http://www.skosmos.skos/groups/sub')), 1 => array ('prefLabel' => 'Freshwater fish', 'uri' => 'http://www.skosmos.skos/groups/fresh', 'hasMembers' => true), 2 => array ('prefLabel' => 'Saltwater fish', 'uri' => 'http://www.skosmos.skos/groups/salt', 'hasMembers' => true),3 => array ('prefLabel' => 'Submarine-like fish', 'uri' => 'http://www.skosmos.skos/groups/sub', 'hasMembers' => true));
     $this->assertEquals($expected, $actual);
@@ -1065,7 +1066,7 @@ public function testListConceptGroupContentsExcludingDeprecatedConcept()
   {
     $voc = $this->model->getVocabulary('groups');
     $graph = $voc->getGraph();
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
     $actual = $sparql->ListConceptGroupContents('http://www.w3.org/2004/02/skos/core#Collection', 'http://www.skosmos.skos/groups/salt', 'en');
     $this->assertEquals('http://www.skosmos.skos/groups/ta113', $actual[0]['uri']);
     $this->assertEquals(1, sizeof($actual));
@@ -1080,7 +1081,7 @@ public function testListConceptGroupContentsIncludingDeprecatedConcept()
   {
       $voc = $this->model->getVocabulary('showDeprecated');
       $graph = $voc->getGraph();
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+      $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
       $actual = $sparql->ListConceptGroupContents('http://www.w3.org/2004/02/skos/core#Collection', 'http://www.skosmos.skos/groups/salt', 'en', $voc->getConfig()->getShowDeprecated());
       $expected = array (
           0 => array (
@@ -1111,7 +1112,7 @@ public function testQueryChangeList()
   {
     $voc = $this->model->getVocabulary('changes');
     $graph = $voc->getGraph();
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
     $actual = $sparql->queryChangeList('dc:created', 'en', 0, 10);
     $order = array();
     foreach($actual as $concept) {
@@ -1129,7 +1130,7 @@ public function testQueryChangeList()
   public function testMalformedDates() {
     $voc = $this->model->getVocabulary('test');
     $graph = $voc->getGraph();
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
     $result = $sparql->queryChangeList('dc:modified', 'en', 0, 10);
     $uris = array();
     foreach($result as $concept) {
@@ -1146,7 +1147,7 @@ public function testLimitSearchToType()
   {
     $voc = $this->model->getVocabulary('test');
     $graph = $voc->getGraph();
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
     $this->params->method('getSearchTerm')->will($this->returnValue('*'));
     $this->params->method('getTypeLimit')->will($this->returnValue(array('mads:Topic')));
     $actual = $this->sparql->queryConcepts(array($voc), null, true, $this->params);
@@ -1186,7 +1187,7 @@ public function testQueryConceptsWithExtraFields()
    */
   public function testQuerySuperProperties()
   {
-      $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model);
+      $this->sparql = new GenericSparql($this->endpoint, '?graph', $this->model);
       $actual = $this->sparql->querySuperProperties('http://example.com/myns#property');
       $this->assertEquals(1, sizeof($actual));
       $expected = array('http://example.com/myns#superProperty');
@@ -1202,7 +1203,7 @@ public function testQueryAllConceptLabels()
   {
       $voc = $this->model->getVocabulary('test');
       $graph = $voc->getGraph();
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+      $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
 
       $actual = $sparql->queryAllConceptLabels('http://www.skosmos.skos/test/ta112', 'en');
 
@@ -1224,7 +1225,7 @@ public function testQueryAllConceptLabelsNonexistentConcept()
   {
       $voc = $this->model->getVocabulary('test');
       $graph = $voc->getGraph();
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+      $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
 
       $actual = $sparql->queryAllConceptLabels('http://www.skosmos.skos/test/notfound', 'en');
 
@@ -1240,7 +1241,7 @@ public function testQueryAllConceptLabelsNoPrefLabel()
   {
       $voc = $this->model->getVocabulary('test');
       $graph = $voc->getGraph();
-      $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+      $sparql = new GenericSparql($this->endpoint, $graph, $this->model);
 
       $actual = $sparql->queryAllConceptLabels('http://www.skosmos.skos/test/ta112', 'sv');
 

tests/GlobalConfigTest.php

@@ -23,7 +23,7 @@ protected function setUp() : void
 
     public function testGetDefaultEndpoint()
     {
-        $this->assertEquals("http://localhost:13030/skosmos-test/sparql", $this->config->getDefaultEndpoint());
+        $this->assertEquals(getenv('SKOSMOS_SPARQL_ENDPOINT'), $this->config->getDefaultEndpoint());
     }
 
     public function testGetDefaultSparqlDialect()

tests/JenaTextSparqlTest.php

@@ -17,14 +17,15 @@ protected function setUp() : void
     $this->vocab = $this->model->getVocabulary('test');
     $this->graph = $this->vocab->getGraph();
     $this->params = $this->getMockBuilder('ConceptSearchParameters')->disableOriginalConstructor()->getMock();
-    $this->sparql = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model);
+    $this->endpoint = getenv('SKOSMOS_SPARQL_ENDPOINT');
+    $this->sparql = new JenaTextSparql($this->endpoint, $this->graph, $this->model);
   }
 
   /**
    * @covers JenaTextSparql::__construct
    */
   public function testConstructor() {
-    $gs = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model);
+    $gs = new JenaTextSparql($this->endpoint, $this->graph, $this->model);
     $this->assertInstanceOf('JenaTextSparql', $gs);
   }
 
@@ -117,7 +118,7 @@ public function testQueryConceptsAlphabeticalLimitAndOffset() {
   public function testQualifiedNotationAlphabeticalList() {
     $voc = $this->model->getVocabulary('test-qualified-notation');
     $res = new EasyRdf\Resource("http://www.w3.org/2004/02/skos/core#notation");
-    $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $voc->getGraph(), $this->model);
+    $sparql = new GenericSparql($this->endpoint, $voc->getGraph(), $this->model);
 
     $actual = $sparql->queryConceptsAlphabetical("a", "en", null, null, null, false, $res);
 
@@ -187,7 +188,7 @@ public function testQualifiedNotationAlphabeticalList() {
   public function testQualifiedBroaderAlphabeticalList() {
     $voc = $this->model->getVocabulary('test-qualified-broader');
     $res = new EasyRdf\Resource("http://www.w3.org/2004/02/skos/core#broader");
-    $sparql = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $voc->getGraph(), $this->model);
+    $sparql = new JenaTextSparql($this->endpoint, $voc->getGraph(), $this->model);
 
     $actual = $sparql->queryConceptsAlphabetical("a", "en", null, null, null, false, $res);
 
@@ -358,7 +359,7 @@ public function testQueryConceptsDefaultGraph()
   public function testQueryConceptsAlphabeticalOrderBy() {
     $vocab = $this->model->getVocabulary('collation');
     $graph = $vocab->getGraph();
-    $sparql = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model);
+    $sparql = new JenaTextSparql($this->endpoint, $graph, $this->model);
     $actual = $sparql->queryConceptsAlphabetical('t', 'fi');
     $expected = array (
       0 => array (

tests/bootstrap.php

@@ -1,3 +1,11 @@
 <?php
+
+// make sure that a SPARQL endpoint is set by an environment variable
+$endpoint = getenv('SKOSMOS_SPARQL_ENDPOINT');
+if (!$endpoint) {
+    // default to Fuseki running on localhost:13030 as provided by init_fuseki.sh
+    putenv('SKOSMOS_SPARQL_ENDPOINT=http://localhost:13030/skosmos-test/sparql');
+}
+
 require_once(__DIR__ . '/../vendor/autoload.php');
 require_once(__DIR__ . '/../model/Model.php');

tests/init_fuseki.sh

@@ -15,8 +15,9 @@ fi
 
 if [ ! -f "apache-jena-fuseki-$FUSEKI_VERSION/fuseki-server" ]; then
     echo "fuseki server file not found - downloading it"
-    wget --output-document=fuseki-dist.tar.gz "$fusekiurl"
-    tar -zxvf fuseki-dist.tar.gz
+    wget --no-verbose --output-document=fuseki-dist.tar.gz "$fusekiurl"
+    echo "uncompressing fuseki distribution"
+    tar -zxf fuseki-dist.tar.gz
 fi
 
 cd "apache-jena-fuseki-$FUSEKI_VERSION"