Merge master into rtl branch

.codeclimate.yml

@@ -38,8 +38,7 @@ exclude_paths:
 - LICENSE
 - README.md
 - composer.json 
-- config.inc.dist
-- vocabularies.ttl.dist
+- config.ttl.dist
 - favicon.ico 
 - phpdoc.sh 
 - phpunit.xml

.gitignore

@@ -1,7 +1,11 @@
-config.inc
-vocabularies.ttl
+config.ttl
+build
 vendor
 report
 components
 composer.phar
 composer.lock
+tests/jena-fuseki*
+.vagrant
+.project
+.DS_Store

.travis.yml

@@ -2,29 +2,39 @@ sudo: required
 dist: trusty
 language: php
 php:
-  - "5.6"
+  - 7.0
+  - 7.1
+  - 7.2
 install:
   - composer install
 cache:
   directories:
     - $HOME/.composer 
     - vendor
 before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
   - cd tests
+  - export LANGUAGE=fr
   - sh ./init_fuseki.sh
   - cd ..
 after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
   - pkill -f 'java -Xmx1200M -jar'
-  - vendor/bin/test-reporter --stdout > codeclimate.json
-  - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"
-addons:
-  code_climate:
-    repo_token: fb98170a5c7ea9cc2bbab19ff26268335e6a11a4f8267ca935e5e8ff4624886c
 env:
-  - FUSEKI_VERSION=3.4.0
-  - FUSEKI_VERSION=SNAPSHOT
+  global:
+    - CC_TEST_REPORTER_ID=fb98170a5c7ea9cc2bbab19ff26268335e6a11a4f8267ca935e5e8ff4624886c
+  matrix:
+    - FUSEKI_VERSION=3.9.0
+    - FUSEKI_VERSION=SNAPSHOT
 matrix:
+  exclude:
+  - php: 7.0
+    env: FUSEKI_VERSION=SNAPSHOT
+  - php: 7.1
+    env: FUSEKI_VERSION=SNAPSHOT
   allow_failures:
   - env: FUSEKI_VERSION=SNAPSHOT
 notifications:
-    slack: finto:5rO9Lp4Tstn6y34grtFBpjJ0
+    slack: kansalliskirjasto:9mOKu3Vws1CIddF5jqWgXbli

Dockerfile

@@ -0,0 +1,14 @@
+FROM php:7.0-apache
+
+RUN apt-get update
+
+RUN apt-get -y install locales
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+RUN echo "fr_FR.UTF-8 UTF-8" >> /etc/locale.gen
+RUN echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen
+RUN echo "fi_FI.UTF-8 UTF-8" >> /etc/locale.gen
+RUN echo "sv_SE.UTF-8 UTF-8" >> /etc/locale.gen
+RUN locale-gen
+
+RUN a2enmod rewrite
+RUN docker-php-ext-install gettext

Vagrantfile

@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "ubuntu/xenial64"
+  config.vm.network "forwarded_port", guest: 80, host: 8040
+  config.vm.post_up_message = "Skosmos up and running at localhost:8040/Skosmos"
+
+  config.vm.synced_folder "", "/var/www/html/Skosmos"
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.memory = "4096"
+	vb.cpus = "2"
+	# disable creating a log file to root folder:
+	vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ]
+  end
+
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "ansible/playbook.yml"
+	ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" }
+	ansible.verbose = "v"
+	ansible.compatibility_mode = "2.0"
+  end
+
+end

ansible/playbook.retry

@@ -0,0 +1 @@
+default

ansible/playbook.yml

@@ -0,0 +1,10 @@
+---
+- hosts: all
+  become: True
+  gather_facts: False
+  roles:
+    - skosmos
+  pre_tasks:
+    - name: Install Zip and Unzip for Ansible
+      raw: sudo apt-get install zip unzip
+    - setup: # aka gather_facts

ansible/roles/skosmos/files/000-default.conf

@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+
+  <Directory /var/www/html>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+    Order allow,deny
+    allow from all
+  </Directory>
+
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/html
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>

ansible/roles/skosmos/tasks/main.yml

@@ -0,0 +1,64 @@
+
+- name: Update apt cache
+  become: true
+  apt:
+    update_cache: yes
+
+- name: Install required Skosmos dependencies
+  apt:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - apache2
+    - libapache2-mod-php7.0
+    - php-xml
+    - php-mbstring
+    - git
+
+- name: Copy modified Apache configuration file
+  copy:
+    src: files/000-default.conf
+    dest: /etc/apache2/sites-enabled/000-default.conf
+
+- name: Enable Apache module mod_rewrite
+  command: a2enmod rewrite
+
+- name: Restart Apache
+  service:
+    name: apache2
+    state: restarted
+
+- name: Download composer
+  get_url:
+    url: https://getcomposer.org/installer
+    dest: /home/vagrant/composer-installer
+
+- name: Install composer
+  shell: cat /home/vagrant/composer-installer | php -- --install-dir=/usr/local/bin
+
+- name: Rename composer.phar to composer
+  shell: mv /usr/local/bin/composer.phar /usr/local/bin/composer
+  args:
+    creates: /usr/local/bin/composer
+
+- name: Make composer executable
+  file:
+    path: /usr/local/bin/composer
+    mode: a+x
+    state: file
+
+- name: Install Skosmos PHP Dependencies
+  command: chdir=/var/www/html/Skosmos composer install
+
+- name: Copy global and vocabulary-specific configurations
+  copy:
+    src: /var/www/html/Skosmos/config.ttl.dist
+    dest: /var/www/html/Skosmos/config.ttl
+    remote_src : yes
+
+- name: Generate locales, if necessary
+  shell: "locale-gen {{ item }}"
+  with_items:
+    - en_GB.utf8
+    - fi_FI.utf8
+    - sv_SE.utf8

composer.json

@@ -8,11 +8,35 @@
       "type": "package",
       "package": {
         "name": "medialize/uri.js",
-        "version": "1.18.2",
+        "version": "1.19.0",
         "source": {
           "url": "https://github.com/medialize/URI.js.git",
           "type": "git",
-          "reference": "v1.18.2"
+          "reference": "v1.19.0"
+        }
+      }
+    },
+    "lscache": {
+      "type": "package",
+      "package": {
+        "name": "pamelafox/lscache",
+        "version": "1.0.5",
+        "source": {
+          "url": "https://github.com/pamelafox/lscache.git",
+          "type": "git",
+          "reference": "1.0.5"
+        }
+      }
+    },
+    "malihu-custom-scrollbar": {
+      "type": "package",
+      "package": {
+        "name": "malihu/malihu-custom-scrollbar-plugin",
+        "version": "3.1.5",
+        "source": {
+          "url": "https://github.com/malihu/malihu-custom-scrollbar-plugin.git",
+          "type": "git",
+          "reference": "3.1.5"
         }
       }
     },
@@ -30,30 +54,33 @@
     } 
   },
   "require": {
-    "components/jquery": "1.12.*",
+    "components/jquery": "2.2.*",
     "components/jqueryui": "1.12.*",
-    "components/handlebars.js": "v1.3.0",
+    "components/handlebars.js": "v4.0.11",
     "davidstutz/bootstrap-multiselect": "v0.9.13",
     "easyrdf/easyrdf": "0.10.0-alpha.1",
-    "twig/twig": "1.29.*",
-    "twig/extensions": "1.4.*",
-    "twitter/bootstrap": "3.2.*",
+    "etdsolutions/waypoints": "4.0.0",
+    "twig/twig": "2.4.*",
+    "twig/extensions": "1.5.*",
+    "twitter/bootstrap": "3.3.*",
     "twitter/typeahead.js": "v0.10.5",
-    "willdurand/negotiation": "1.5.*",
+    "willdurand/negotiation": "2.3.*",
     "vakata/jstree": "3.3.*",
-    "punic/punic": "1.6.0",
+    "punic/punic": "1.6.5",
     "ml/json-ld": "1.*",
-    "medialize/uri.js": "1.18.2",
+    "medialize/uri.js": "1.19.0",
     "ext-gettext": "*",
-    "monolog/monolog": "^1.22"
+    "monolog/monolog": "1.23.*",
+    "newerton/jquery-mousewheel": "dev-master",
+    "pamelafox/lscache": "1.0.5",
+    "malihu/malihu-custom-scrollbar-plugin": "3.1.5",
+    "grimmlink/qtip2": "3.0.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8 - 5.1",
-    "umpirsky/twig-gettext-extractor": "1.1.*",
-    "phpdocumentor/phpdocumentor": "2.*",
-    "codeclimate/php-test-reporter": "0.3.2",
-    "symfony/dom-crawler": "3.2.6",
-    "mockery/mockery": "1.0.0-alpha1"
+    "phpunit/phpunit": "4.8 - 6.5.5",
+    "umpirsky/twig-gettext-extractor": "1.3.*",
+    "symfony/dom-crawler": "3.4.3",
+    "mockery/mockery": "1.0"
   },
   "autoload": {
     "classmap": ["controller/", "model/", "model/sparql/"]