From bf35dc644b93a58e8e36937d784832b44536010c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 30 Sep 2015 16:29:33 +0200
Subject: [PATCH 001/115] OPUSVIER-3527 - Changed paths in install script and
 added user query for base url.

---
 bin/install.sh | 72 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 21 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index df67642c5..15d58b78a 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -20,14 +20,16 @@ set -e
 
 # START USER-CONFIGURATION
 
-BASEDIR='/var/local/opus4'
 SOLR_SERVER_URL='http://archive.apache.org/dist/lucene/solr/5.2.1/solr-5.2.1.tgz'
 
+MYSQL_CLIENT='/usr/bin/mysql'
+
 # END OF USER-CONFIGURATION
 
 SCRIPT_NAME="`basename "$0"`"
 SCRIPT_NAME_FULL="`readlink -f "$0"`"
 SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
+BASEDIR="`dirname "$SCRIPT_PATH"`"
 
 # check input parameter
 if [ $# -lt 1 ]
@@ -46,30 +48,34 @@ else
   exit 1
 fi
 
-MYSQL_CLIENT='/usr/bin/mysql'
+cd "$BASEDIR"
 
-# including installer components
-if [ -f "$SCRIPT_PATH/installer.includes" ]; then
-    . "$SCRIPT_PATH/installer.includes"
-fi
+# Install dependencies
+# --------------------
 
-cd "$BASEDIR"
+"$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
 
+# Create .htaccess file
+# ---------------------
 
-# install dependencies
-"$SCRIPT_PATH/install-composer.sh" "$BASEDIR/opus4"
+[[ -z $OPUS_URL_BASE ]] && read -p "Base URL for OPUS [opus4]: " OPUS_URL_BASE
 
+OPUS_URL_BASE="/${OPUS_URL_BASE:-opus4}"
+OPUS_URL_BASE_ESC=`echo "$OPUS_URL_BASE" | sed 's/\!/\\\!/g'`
 
-# create .htaccess
-[[ -z $OPUS_URL_BASE ]] && OPUS_URL_BASE='/opus4'
-sed -e "s!<template>!$OPUS_URL_BASE!" opus4/public/htaccess-template > opus4/public/.htaccess
+sed -e "s!<template>!$OPUS_URL_BASE_ESC!" public/htaccess-template > public/.htaccess
 if [ "$OS" = ubuntu ]
 then
-  sed -i -e 's!#Enable for UBUNTU/DEBIAN:# !!' opus4/public/.htaccess
+  sed -i -e 's!#Enable for UBUNTU/DEBIAN:# !!' public/.htaccess
 fi
 
-# prepare apache config
-sed -e "s!/OPUS_URL_BASE!/$OPUS_URL_BASE!g; s!/BASEDIR/!/$BASEDIR/!; s!//*!/!g" "$BASEDIR/opus4/apacheconf/apache.conf.template" > "$BASEDIR/opus4/apacheconf/apache.conf"
+# Prepare apache configuration
+# ----------------------------
+
+sed -e "s!/OPUS_URL_BASE!/$OPUS_URL_BASE!g; s!/BASEDIR/!/$BASEDIR/!; s!//*!/!g" "$BASEDIR/apacheconf/apache.conf.template" > "$BASEDIR/apacheconf/apache.conf"
+
+# Create OPUS user account
+# ------------------------
 
 # promt for username, if required
 echo "OPUS requires a dedicated system account under which Solr will be running."
@@ -111,6 +117,9 @@ fi
 OPUS_GROUP_NAME="`id -gn "$OPUS_USER_NAME"`"
 OWNER="$OPUS_USER_NAME:$OPUS_GROUP_NAME"
 
+# Create database
+# ---------------
+
 # prompt for database parameters
 [[ -z $DBNAME               ]] && read -p "New OPUS Database Name [opus400]: "          DBNAME
 [[ -z $ADMIN                ]] && read -p "New OPUS Database Admin Name [opus4admin]: " ADMIN
@@ -123,8 +132,8 @@ echo
 [[ -z $MYSQLPORT            ]] && read -p "MySQL DBMS Port [3306]: "                    MYSQLPORT
 [[ -z $MYSQLROOT            ]] && read -p "MySQL Root User [root]: "                    MYSQLROOT
 read -p "MySQL Root User Password: " -s MYSQLROOT_PASSWORD
-echo
 
+echo
 
 # set defaults if value is not given
 DBNAME="${DBNAME:-opus400}"
@@ -164,8 +173,11 @@ GRANT SELECT,INSERT,UPDATE,DELETE ON $DBNAME.* TO '$WEBAPP_USER'@'$MYSQLHOST' ID
 FLUSH PRIVILEGES;
 LimitString
 
+# Update configuration files
+# --------------------------
+
 # create config.ini and set database related parameters
-cd "$BASEDIR/opus4/application/configs"
+cd "$BASEDIR/application/configs"
 cp config.ini.template config.ini
 if [ localhost != "$MYSQLHOST" ]; then
   sed -i -e "s!^; db.params.host = localhost!db.params.host = '$MYSQLHOST_ESC'!" config.ini
@@ -178,7 +190,8 @@ sed -i -e "s!@db.user.name@!'$WEBAPP_USER_ESC'!" \
        -e "s!@db.name@!'$DBNAME_ESC'!" config.ini
 
 # create createdb.sh and set database related parameters
-cd "$BASEDIR/opus4/db"
+# TODO creating symbolic links
+cd "$BASEDIR/db"
 if [ ! -e createdb.sh ]; then
   cp createdb.sh.template createdb.sh
   if [ localhost != "$MYSQLHOST" ]; then
@@ -194,8 +207,11 @@ if [ ! -e createdb.sh ]; then
   bash createdb.sh || rm createdb.sh
 fi
 
-# install and configure Solr search server
+# Install and configure Solr search server
+# ----------------------------------------
+
 cd "$BASEDIR"
+
 [ -z "$INSTALL_SOLR" ] && read -p "Install and configure Solr server? [Y]: " INSTALL_SOLR
 if [ -z "$INSTALL_SOLR" ] || [ "$INSTALL_SOLR" = Y ] || [ "$INSTALL_SOLR" = y ]
 then
@@ -341,7 +357,9 @@ EOT
   fi
 fi
 
-# import some test documents
+# import test documents
+# ---------------------
+
 [ -z "$IMPORT_TESTDATA" ] && read -p "Import test data? [Y]: " IMPORT_TESTDATA
 if [ -z "$IMPORT_TESTDATA" ] || [ "$IMPORT_TESTDATA" = Y ] || [ "$IMPORT_TESTDATA" = y ]
 then
@@ -401,6 +419,9 @@ then
   "$BASEDIR/opus4/scripts/SolrIndexBuilder.php"
 fi
 
+# Set file permissions
+# --------------------
+
 # change file owner of all files in $BASEDIR to $OPUS_USER_NAME
 chown -R "$OWNER" "$BASEDIR"
 
@@ -409,12 +430,18 @@ cd "$(readlink "$BASEDIR/workspace")"
 find ../workspace -type d -print0 | xargs -0 -- chmod 777
 find ../workspace -type f -print0 | xargs -0 -- chmod 666
 
+# Cleanup downloads
+# -----------------
+
 # delete tar archives
 [ -z "$DELETE_DOWNLOADS" ] && read -p "Delete downloads? [N]: " DELETE_DOWNLOADS
 if [ "$DELETE_DOWNLOADS" = Y ] || [ "$DELETE_DOWNLOADS" = y ]; then
   rm -rf downloads
 fi
 
+# Restart Apache
+# --------------
+
 [ -z "$RESTART_APACHE" ] && RESTART_APACHE=Y
 if [ "$RESTART_APACHE" = Y ];
 then
@@ -422,7 +449,10 @@ then
   /etc/init.d/apache2 restart
 fi
 
+# Installation finished
+# ---------------------
+
 echo
 echo
-echo "OPUS 4 is running now! Point your browser to http://localhost$OPUS_URL_BASE"
+echo "OPUS 4 is running now! Point your browser to http://localhost$OPUS_URL_BASE_ESC"
 echo

From 21f450ec9b99b3c56647f78e8d6c209bb236416b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 1 Oct 2015 16:25:40 +0200
Subject: [PATCH 002/115] OPUSVIER-3527 - Create symbolic link to database
 schema in framework package.

---
 bin/install.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/install.sh b/bin/install.sh
index 15d58b78a..4262946b6 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -55,6 +55,15 @@ cd "$BASEDIR"
 
 "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
 
+# Link to framework
+# -----------------
+
+cd "$BASEDIR/db"
+ln -svnf "$BASEDIR/vendor/opus4-repo/framework/db/schema" "schema"
+cd "$BASEDIR"
+
+exit 0;
+
 # Create .htaccess file
 # ---------------------
 

From c7d237783bc2fc287856c4ea92ed88f407e83af6 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 2 Oct 2015 11:31:22 +0200
Subject: [PATCH 003/115] OPUSVIER-3527 - Link apache2 site configuration to
 sites folder. Modified config template for new folder hierarchy.

---
 apacheconf/apache.conf.template |  4 ++--
 bin/install.sh                  | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apacheconf/apache.conf.template b/apacheconf/apache.conf.template
index 81b8be6e7..a67fd0c02 100644
--- a/apacheconf/apache.conf.template
+++ b/apacheconf/apache.conf.template
@@ -1,7 +1,7 @@
 AllowEncodedSlashes On
 
-Alias /OPUS_URL_BASE "/BASEDIR/opus4/public/"
-<Directory "/BASEDIR/opus4/public/">
+Alias /OPUS_URL_BASE "/BASEDIR/public/"
+<Directory "/BASEDIR/public/">
  Options FollowSymLinks
  AllowOverride All
  Order deny,allow
diff --git a/bin/install.sh b/bin/install.sh
index 4262946b6..210eb01d5 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -24,6 +24,8 @@ SOLR_SERVER_URL='http://archive.apache.org/dist/lucene/solr/5.2.1/solr-5.2.1.tgz
 
 MYSQL_CLIENT='/usr/bin/mysql'
 
+APACHE_SITES='/etc/apache2/sites-available'
+
 # END OF USER-CONFIGURATION
 
 SCRIPT_NAME="`basename "$0"`"
@@ -62,16 +64,18 @@ cd "$BASEDIR/db"
 ln -svnf "$BASEDIR/vendor/opus4-repo/framework/db/schema" "schema"
 cd "$BASEDIR"
 
-exit 0;
-
 # Create .htaccess file
 # ---------------------
 
 [[ -z $OPUS_URL_BASE ]] && read -p "Base URL for OPUS [opus4]: " OPUS_URL_BASE
 
-OPUS_URL_BASE="/${OPUS_URL_BASE:-opus4}"
+OPUS_NAME="${OPUS_URL_BASE:-opus4}"
+OPUS_NAME_ESC=`echo "$OPUS_NAME" | sed 's/\!/\\\!/g'`
+
+OPUS_URL_BASE="/$OPUS_NAME"
 OPUS_URL_BASE_ESC=`echo "$OPUS_URL_BASE" | sed 's/\!/\\\!/g'`
 
+
 sed -e "s!<template>!$OPUS_URL_BASE_ESC!" public/htaccess-template > public/.htaccess
 if [ "$OS" = ubuntu ]
 then
@@ -83,6 +87,13 @@ fi
 
 sed -e "s!/OPUS_URL_BASE!/$OPUS_URL_BASE!g; s!/BASEDIR/!/$BASEDIR/!; s!//*!/!g" "$BASEDIR/apacheconf/apache.conf.template" > "$BASEDIR/apacheconf/apache.conf"
 
+# TODO handle case file exists
+cd $APACHE_SITES
+ln -sv "$BASEDIR/apacheconf/apache.conf" "$OPUS_NAME.conf"
+cd $BASEDIR
+
+exit 0;
+
 # Create OPUS user account
 # ------------------------
 
@@ -199,7 +210,6 @@ sed -i -e "s!@db.user.name@!'$WEBAPP_USER_ESC'!" \
        -e "s!@db.name@!'$DBNAME_ESC'!" config.ini
 
 # create createdb.sh and set database related parameters
-# TODO creating symbolic links
 cd "$BASEDIR/db"
 if [ ! -e createdb.sh ]; then
   cp createdb.sh.template createdb.sh

From 169708c256fe4a31653a6a4bc0683e0917865c4a Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 27 Apr 2016 15:30:13 +0200
Subject: [PATCH 004/115] OPUSVIER-3593 - Changed references from
 opus4current.sql to opus4schema.sql. Use newest framework package.

---
 composer.json                |  2 +-
 db/createdb.sh.template      |  2 +-
 tests/rebuild-database.php   |  2 +-
 tests/support/TestHelper.php | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 304984878..42d765cea 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "zendframework/zendframework1": "1.12.18",
     "jpgraph/jpgraph": "dev-master",
     "solarium/solarium": "3.4.1",
-    "opus4-repo/framework": "4.5.0-RC1",
+    "opus4-repo/framework": "dev-master",
     "opus4-repo/search": "4.5.0-RC1",
     "components/jquery": "1.9.*"
   },
diff --git a/db/createdb.sh.template b/db/createdb.sh.template
index 78b11534b..b7a4e7c38 100644
--- a/db/createdb.sh.template
+++ b/db/createdb.sh.template
@@ -22,7 +22,7 @@ dbname=@db.name@
 # path to mysql binary
 mysql_bin=/usr/bin/mysql
 # path to schema file
-schema_file="$BASEDIR/vendor/opus4-repo/framework/db/schema/opus4current.sql"
+schema_file="$BASEDIR/vendor/opus4-repo/framework/db/schema/opus4schema.sql"
 # path to different sql locations
 master_dir=masterdata/
 
diff --git a/tests/rebuild-database.php b/tests/rebuild-database.php
index 3b3ba2a94..24c21f4b5 100644
--- a/tests/rebuild-database.php
+++ b/tests/rebuild-database.php
@@ -91,7 +91,7 @@
 
 echo(PHP_EOL . "Importing database schema ... " . PHP_EOL);
 // TODO move into $database->create()?
-$database->import(APPLICATION_PATH . '/db/schema/opus4current.sql');
+$database->import(APPLICATION_PATH . '/db/schema/opus4schema.sql');
 
 echo(PHP_EOL . 'Import master data ... ' . PHP_EOL);
 $database->import(APPLICATION_PATH . '/db/masterdata');
diff --git a/tests/support/TestHelper.php b/tests/support/TestHelper.php
index ed2845ba8..6c064fd08 100644
--- a/tests/support/TestHelper.php
+++ b/tests/support/TestHelper.php
@@ -53,13 +53,13 @@ protected function _initDatabase() {
 
         $log = $this->getResource('Logging');
 
-        // Determine current schema revision from opus4current.sql
-        $sqlFile = dirname(dirname(__FILE__)) . '/db/schema/opus4current.sql';
+        // Determine current schema revision from opus4schema.sql
+        $sqlFile = dirname(dirname(__FILE__)) . '/db/schema/opus4schema.sql';
         if (false === is_file($sqlFile)) {
             $log->warn('Schema file ' . $sqlFile . ' not found.');
             return;
         }
-        
+
         // Scan for revision information
         $handle = @fopen($sqlFile, 'r');
         if (false === $handle) {
@@ -75,23 +75,23 @@ protected function _initDatabase() {
             }
         }
         fclose($handle);
-        
+
         // Load revision from database
         $dba = Zend_Registry::get('db_adapter');
         try {
             $row = $dba->fetchRow($dba->select()->from('schema_version'));
             if (true === empty($row)) {
                 throw new Exception('No revision information available.');
-            } 
+            }
             $dbRev = $row['revision'];
         } catch (Exception $ex) {
             $log->warn('Cannot read schema information from database: ' . $ex->getMessage());
             return;
-        }           
-            
+        }
+
         // Compare revisions and throw exception if needed
         if (isset($sqlRev, $dbRev) && $sqlRev !== $dbRev) {
-            throw new Exception("Database schema revision mismatch. SQL file has '$sqlRev', DB has '$dbRev'. Consider rebuilding the database.\n");            
+            throw new Exception("Database schema revision mismatch. SQL file has '$sqlRev', DB has '$dbRev'. Consider rebuilding the database.\n");
         }
     }
 

From 54e780e96de37e084b603b6dd6b1d95e13886d24 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 27 Apr 2016 17:25:58 +0200
Subject: [PATCH 005/115] OPUSVIER-3575 - Added function to get repository
 name.

---
 library/Application/Configuration.php           | 17 +++++++++++++++++
 tests/library/Application/ConfigurationTest.php | 12 ++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/library/Application/Configuration.php b/library/Application/Configuration.php
index f9e08821c..6cc2d85f2 100644
--- a/library/Application/Configuration.php
+++ b/library/Application/Configuration.php
@@ -104,6 +104,23 @@ public function getConfig() {
         return Zend_Registry::get('Zend_Config');
     }
 
+    /**
+     * Returns name of repository.
+     * @return string
+     */
+    public function getName() {
+        $config = $this->getConfig();
+
+        if (isset($config->name)) {
+            $name = $config->name;
+        }
+        else {
+            $name = 'OPUS 4';
+        }
+
+        return $name;
+    }
+
     /**
      * Liefert die Sprachen, die von OPUS unterstützt werden.
      * @return array
diff --git a/tests/library/Application/ConfigurationTest.php b/tests/library/Application/ConfigurationTest.php
index 1620e6ee5..c68e3b48e 100644
--- a/tests/library/Application/ConfigurationTest.php
+++ b/tests/library/Application/ConfigurationTest.php
@@ -157,4 +157,16 @@ public function testGetInstance() {
         $this->assertSame($config, Application_Configuration::getInstance());
     }
 
+    public function testGetName() {
+        $config = Application_Configuration::getInstance();
+        $this->assertEquals('OPUS 4', $config->getName());
+
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array('name' => 'OPUS Test')));
+        $this->assertEquals('OPUS Test', $config->getName());
+
+        $zendConfig = Zend_Registry::get('Zend_Config');
+        unset($zendConfig->name);
+        $this->assertEquals('OPUS 4', $config->getName());
+    }
+
 }

From 4931d014ba55cd9fd93f1ab9885ae54424ea7c54 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 27 Apr 2016 18:06:07 +0200
Subject: [PATCH 006/115] OPUSVIER-3575 - Title of RSS feeds now configurable.

---
 RELEASE_NOTES.md                              |   8 ++
 application/configs/application.ini           |   1 +
 modules/rss/controllers/IndexController.php   |  29 ++---
 modules/rss/models/Feed.php                   | 100 +++++++++++++++++
 .../rss/views/scripts/stylesheets/rss2_0.xslt |  12 ++-
 .../rss/controllers/IndexControllerTest.php   |   6 +-
 tests/modules/rss/models/FeedTest.php         | 101 ++++++++++++++++++
 7 files changed, 240 insertions(+), 17 deletions(-)
 create mode 100644 modules/rss/models/Feed.php
 create mode 100644 tests/modules/rss/models/FeedTest.php

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b95e29f08..c295d1416 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,6 +2,14 @@
 
 ---
 
+## Release 4.5 2016-05-xx
+
+Der Schlüssel 'name' in der config.ini kann verwendet werden, um den Namen der
+Instanz zu definieren, z.B. 'OPUS 4 Demo'. Dieser Name wird z.B. im Titel von
+RSS Feeds eingesetzt, anstelle des bisherigen 'OPUS RSS Feed'.
+
+---
+
 ## Release 4.5-RC1 2016-04-25
 
 Dies ist der erste Release Candidate für OPUS 4.5. Er dient dazu den Release
diff --git a/application/configs/application.ini b/application/configs/application.ini
index 9320dcf93..e6f8c32db 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -74,6 +74,7 @@ supportedLanguages = de,en
 
 ;GENERAL SETTINGS
 theme = opus4
+name = 'OPUS 4'
 security = 1
 workspacePath = APPLICATION_PATH "/workspace"
 version = trunk
diff --git a/modules/rss/controllers/IndexController.php b/modules/rss/controllers/IndexController.php
index cb5d38839..5b88d8702 100644
--- a/modules/rss/controllers/IndexController.php
+++ b/modules/rss/controllers/IndexController.php
@@ -29,11 +29,11 @@
  * @author      Sascha Szott <szott@zib.de>
  * @author      Michael Lang <lang@zib.de>
  * @author      Jens Schwidder <schwidder@zib.de>
- * @copyright   Copyright (c) 2008-2014, OPUS 4 development team
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
  *
  * TODO context spezifische Titel für RSS feed (latest, collections, ...)
+ * TODO move feed code into Rss_Model_Feed
  */
 
 class Rss_IndexController extends Application_Controller_Xml {
@@ -81,7 +81,8 @@ public function indexAction() {
         }
 
         $this->loadStyleSheet($this->view->getScriptPath('') . 'stylesheets' . DIRECTORY_SEPARATOR . 'rss2_0.xslt');
-        $this->setLink();
+
+        $this->setParameters();
         $this->setDates($resultList);
         $this->setItems($resultList);
         $this->setFrontdoorBaseUrl();
@@ -107,10 +108,17 @@ private function handleSolrError(Opus_SolrSearch_Exception $exception) {
         }
     }
 
-    private function setLink() {
-        $this->_proc->setParameter(
-            '', 'link', $this->view->serverUrl() . $this->getRequest()->getBaseUrl() . '/index/index/'
-        );
+    /**
+     * Sets parameters for XSLT processor.
+     */
+    private function setParameters() {
+        $feed = new Rss_Model_Feed($this->view);
+
+        $feedLink = $this->view->serverUrl() . $this->getRequest()->getBaseUrl() . '/index/index/';
+
+        $this->_proc->setParameter('', 'feedTitle', $feed->getTitle());
+        $this->_proc->setParameter('', 'feedDescription', $feed->getDescription());
+        $this->_proc->setParameter('', 'link', $feedLink);
     }
 
     private function setDates($resultList) {
@@ -118,14 +126,12 @@ private function setDates($resultList) {
             $latestDoc = $resultList->getResults();
             $document = new Opus_Document($latestDoc[0]->getId());
             $date = new Zend_Date($document->getServerDatePublished());
-            $this->_proc->setParameter('', 'lastBuildDate', $date->get(Zend_Date::RFC_2822));
-            $this->_proc->setParameter('', 'pubDate', $date->get(Zend_Date::RFC_2822));
         }
         else {
             $date = Zend_Date::now();
-            $this->_proc->setParameter('', 'lastBuildDate', $date->get(Zend_Date::RFC_2822));
-            $this->_proc->setParameter('', 'pubDate', $date->get(Zend_Date::RFC_2822));
         }
+        $this->_proc->setParameter('', 'lastBuildDate', $date->get(Zend_Date::RFC_2822));
+        $this->_proc->setParameter('', 'pubDate', $date->get(Zend_Date::RFC_2822));
     }
 
     private function setItems($resultList) {
@@ -148,4 +154,3 @@ private function setFrontdoorBaseUrl() {
     }
 
 }
-
diff --git a/modules/rss/models/Feed.php b/modules/rss/models/Feed.php
new file mode 100644
index 000000000..e674e280b
--- /dev/null
+++ b/modules/rss/models/Feed.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Module_Rss
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ *
+ * TODO context spezifische Titel für RSS feed (latest, collections, ...)
+ */
+
+class Rss_Model_Feed extends Application_Model_Abstract {
+
+    private $view;
+
+    public function __construct($view) {
+        $this->view = $view;
+    }
+
+    /**
+     * Returns title of RSS feed.
+     *
+     * The title can be defined in config.ini using the key 'rss.default.feedTitle'.
+     * If no title is defined the 'name' (config.ini) of the repository is used.
+     *
+     * In 'rss.default.feedTitle' three placeholders can be used:
+     *
+     * %1$s - Name of repository ('name' key in config.ini)
+     * %2$s - Full URL for repository, e.g. 'http://opus4web.zib.de/opus4-demo'
+     * %3$s - Base URL for repository without leading '/', e.g. 'opus4-demo'
+     *
+     * @return string
+     */
+    public function getTitle() {
+        $config = $this->getConfig();
+
+        $name = Application_Configuration::getInstance()->getName();
+
+        if (isset($config->rss->default->feedTitle)) {
+            $feedTitle = $config->rss->default->feedTitle;
+        }
+        else {
+            $feedTitle = $name;
+        }
+
+        $feedTitle = sprintf($feedTitle,
+            $name,
+            $this->view->fullUrl(),
+            substr($this->view->baseUrl(), 1)
+        );
+
+        return $feedTitle;
+    }
+
+    /**
+     * Returns description of RSS feed.
+     *
+     * The description can be defined in config.ini using key 'rss.default.feedDescription'.
+     * The default is 'OPUS documents'.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        $config = $this->getConfig();
+
+        if (isset($config->rss->default->feedDescription)) {
+            $feedDescription = $config->rss->default->feedDescription;
+        }
+        else {
+            $feedDescription = 'OPUS documents';
+        }
+
+        return $feedDescription;
+    }
+
+}
diff --git a/modules/rss/views/scripts/stylesheets/rss2_0.xslt b/modules/rss/views/scripts/stylesheets/rss2_0.xslt
index 789387114..9a551c997 100644
--- a/modules/rss/views/scripts/stylesheets/rss2_0.xslt
+++ b/modules/rss/views/scripts/stylesheets/rss2_0.xslt
@@ -50,8 +50,12 @@
         <xsl:element name="rss">
             <xsl:attribute name="version">2.0</xsl:attribute>
             <xsl:element name="channel">
-                <xsl:element name="title">OPUS RSS Feed</xsl:element>
-                <xsl:element name="description">OPUS documents</xsl:element>
+                <xsl:element name="title">
+                    <xsl:value-of select="$feedTitle" />
+                </xsl:element>
+                <xsl:element name="description">
+                    <xsl:value-of select="$feedDescription" />
+                </xsl:element>
                 <xsl:element name="link">
                     <xsl:value-of select="$link"/>
                 </xsl:element>
@@ -61,7 +65,7 @@
                 <xsl:element name="lastBuildDate">
                     <xsl:value-of select="$lastBuildDate"/>
                 </xsl:element>
-                <xsl:apply-templates select="Documents"/>                
+                <xsl:apply-templates select="Documents"/>
             </xsl:element>
         </xsl:element>
     </xsl:template>
@@ -126,4 +130,4 @@
         </xsl:if>
     </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/tests/modules/rss/controllers/IndexControllerTest.php b/tests/modules/rss/controllers/IndexControllerTest.php
index 7e0361603..906aff385 100644
--- a/tests/modules/rss/controllers/IndexControllerTest.php
+++ b/tests/modules/rss/controllers/IndexControllerTest.php
@@ -29,9 +29,13 @@
  * @author      Sascha Szott <szott@zib.de>
  * @copyright   Copyright (c) 2008-2011, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
  */
 
+/**
+ * Class Rss_IndexControllerTest
+ *
+ * TODO fix Solr configuration
+ */
 class Rss_IndexControllerTest extends ControllerTestCase {
 
     public function testIndexAction() {
diff --git a/tests/modules/rss/models/FeedTest.php b/tests/modules/rss/models/FeedTest.php
new file mode 100644
index 000000000..f779dfafe
--- /dev/null
+++ b/tests/modules/rss/models/FeedTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Rss_Model_FeedTest extends ControllerTestCase {
+
+    private $_model;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $view = Zend_Registry::get('Opus_View');
+
+        $this->_model = new Rss_Model_Feed($view);
+    }
+
+    public function testGetTitle()
+    {
+        $this->assertEquals('OPUS 4', $this->_model->getTitle());
+
+        $config = Zend_Registry::get('Zend_Config');
+
+        $config->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedTitle' => 'OPUS 4 Test'))
+        )));
+        $this->assertEquals('OPUS 4 Test', $this->_model->getTitle());
+    }
+
+    public function testGetTitleWithName()
+    {
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedTitle' => '%1$s'))
+        )));
+        $this->assertEquals('OPUS 4', $this->_model->getTitle());
+    }
+
+    public function testGetTitleWithFullUrl()
+    {
+        $view = Zend_Registry::get('Opus_View');
+        Zend_Controller_Front::getInstance()->setBaseUrl('/opus4test');
+        $model = new Rss_Model_Feed($view);
+
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedTitle' => '%2$s'))
+        )));
+        $this->assertEquals('http:///opus4test', $this->_model->getTitle());
+    }
+
+    public function testGetTitleWithBaseUrl()
+    {
+        $view = Zend_Registry::get('Opus_View');
+        Zend_Controller_Front::getInstance()->setBaseUrl('/opus4test');
+        $model = new Rss_Model_Feed($view);
+
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedTitle' => '%3$s'))
+        )));
+        $this->assertEquals('opus4test', $model->getTitle());
+    }
+
+    public function testGetDescription() {
+        $this->assertEquals('OPUS documents', $this->_model->getDescription());
+
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedDescription' => 'Test description.'))
+        )));
+
+        $this->assertEquals('Test description.', $this->_model->getDescription());
+    }
+
+}

From 18157018150431fb0c328a2de116c20368a0dafc Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Wed, 27 Apr 2016 21:27:05 +0200
Subject: [PATCH 007/115] OPUSVIER-3575 - Added another placeholder for using
 hostname in RSS title.

---
 modules/rss/models/Feed.php           | 10 ++++++----
 tests/modules/rss/models/FeedTest.php | 26 ++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/modules/rss/models/Feed.php b/modules/rss/models/Feed.php
index e674e280b..66c5e0aff 100644
--- a/modules/rss/models/Feed.php
+++ b/modules/rss/models/Feed.php
@@ -50,8 +50,9 @@ public function __construct($view) {
      * In 'rss.default.feedTitle' three placeholders can be used:
      *
      * %1$s - Name of repository ('name' key in config.ini)
-     * %2$s - Full URL for repository, e.g. 'http://opus4web.zib.de/opus4-demo'
+     * %2$s - Host, e.g. opus4web.zib.de
      * %3$s - Base URL for repository without leading '/', e.g. 'opus4-demo'
+     * %4$s - Full URL for repository, e.g. 'http://opus4web.zib.de/opus4-demo'
      *
      * @return string
      */
@@ -64,13 +65,14 @@ public function getTitle() {
             $feedTitle = $config->rss->default->feedTitle;
         }
         else {
-            $feedTitle = $name;
+            $feedTitle = '%4$s';
         }
 
         $feedTitle = sprintf($feedTitle,
             $name,
-            $this->view->fullUrl(),
-            substr($this->view->baseUrl(), 1)
+            $this->view->getHelper('ServerUrl')->getHost(),
+            substr($this->view->baseUrl(), 1),
+            $this->view->fullUrl()
         );
 
         return $feedTitle;
diff --git a/tests/modules/rss/models/FeedTest.php b/tests/modules/rss/models/FeedTest.php
index f779dfafe..7e0cbedf6 100644
--- a/tests/modules/rss/models/FeedTest.php
+++ b/tests/modules/rss/models/FeedTest.php
@@ -46,14 +46,18 @@ public function setUp()
 
     public function testGetTitle()
     {
-        $this->assertEquals('OPUS 4', $this->_model->getTitle());
+        $view = Zend_Registry::get('Opus_View');
+        Zend_Controller_Front::getInstance()->setBaseUrl('/opus4test');
+        $model = new Rss_Model_Feed($view);
+
+        $this->assertEquals('http:///opus4test', $model->getTitle());
 
         $config = Zend_Registry::get('Zend_Config');
 
         $config->merge(new Zend_Config(array(
             'rss' => array('default' => array('feedTitle' => 'OPUS 4 Test'))
         )));
-        $this->assertEquals('OPUS 4 Test', $this->_model->getTitle());
+        $this->assertEquals('OPUS 4 Test', $model->getTitle());
     }
 
     public function testGetTitleWithName()
@@ -71,7 +75,7 @@ public function testGetTitleWithFullUrl()
         $model = new Rss_Model_Feed($view);
 
         Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
-            'rss' => array('default' => array('feedTitle' => '%2$s'))
+            'rss' => array('default' => array('feedTitle' => '%4$s'))
         )));
         $this->assertEquals('http:///opus4test', $this->_model->getTitle());
     }
@@ -88,7 +92,21 @@ public function testGetTitleWithBaseUrl()
         $this->assertEquals('opus4test', $model->getTitle());
     }
 
-    public function testGetDescription() {
+    public function testGetTitleWithHost()
+    {
+        $view = Zend_Registry::get('Opus_View');
+        Zend_Controller_Front::getInstance()->setBaseUrl('/opus4test');
+        $view->getHelper('ServerUrl')->setHost('testhost');
+        $model = new Rss_Model_Feed($view);
+
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'rss' => array('default' => array('feedTitle' => '%2$s'))
+        )));
+        $this->assertEquals('testhost', $model->getTitle());
+    }
+
+    public function testGetDescription()
+    {
         $this->assertEquals('OPUS documents', $this->_model->getDescription());
 
         Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(

From 43dc700cd87505a6dd4660188370e6e0ec79a9d4 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 28 Apr 2016 15:02:00 +0200
Subject: [PATCH 008/115] OPUSVIER-3594 - Sichtbares Signal im Header wenn
 nicht in 'production' Modus.

---
 modules/default/language/default.tmx          | 27 ++++++++++-------
 public/layouts/opus4/common.phtml             |  3 ++
 public/layouts/opus4/css/opus.css             |  9 ++++++
 .../home/controllers/IndexControllerTest.php  | 30 +++++++++++++++++++
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/modules/default/language/default.tmx b/modules/default/language/default.tmx
index 6625401aa..7e975749b 100644
--- a/modules/default/language/default.tmx
+++ b/modules/default/language/default.tmx
@@ -77,8 +77,8 @@
             </tuv>
         </tu>
 
-  
-    
+
+
         <tu tuid="home_modulename">
           <tuv xml:lang="en">
             <seg>Home</seg>
@@ -113,7 +113,7 @@
         </tu>
 
 
-    
+
         <tu tuid="home_index_index_actionname">
           <tuv xml:lang="en">
             <seg>Home</seg>
@@ -392,7 +392,7 @@
             <seg>Speichern</seg>
           </tuv>
         </tu>
-        
+
         <tu tuid="Cancel">
           <tuv xml:lang="en">
             <seg>Cancel</seg>
@@ -400,8 +400,8 @@
           <tuv xml:lang="de">
             <seg>Abbrechen</seg>
           </tuv>
-        </tu>        
-        
+        </tu>
+
         <tu tuid="Next">
           <tuv xml:lang="en">
             <seg>Next</seg>
@@ -410,7 +410,7 @@
             <seg>Weitere</seg>
           </tuv>
         </tu>
-		
+
         <tu tuid="pkm_list_keys">
           <tuv xml:lang="en">
             <seg>Key Management</seg>
@@ -689,7 +689,7 @@
             <seg>Nachricht vom OPUS 4 Repository bezüglich Ihrer Veröffentlichung</seg>
         </tuv>
     </tu>
-    
+
      <tu tuid="results_title_single">
          <tuv xml:lang="en">
              <seg>search hit</seg>
@@ -708,7 +708,14 @@
          </tuv>
      </tu>
 
-
+     <tu tuid="opus.environment">
+         <tuv xml:lang="en">
+             <seg>NON PRODUCTION ENVIRONMENT</seg>
+         </tuv>
+         <tuv xml:lang="de">
+             <seg>TESTUMGEBUNG</seg>
+         </tuv>
+     </tu>
 
     </body>
-</tmx>
\ No newline at end of file
+</tmx>
diff --git a/public/layouts/opus4/common.phtml b/public/layouts/opus4/common.phtml
index f3ed8bfdb..7495381b2 100755
--- a/public/layouts/opus4/common.phtml
+++ b/public/layouts/opus4/common.phtml
@@ -140,6 +140,9 @@ if (isset($config->javascript->latex->mathjax)) {
                     <?php endif ?>
                     <div id="login-bar" class="nav"><?= $this->loginBar() ?></div>
                 </div>
+                <?php if (APPLICATION_ENV !== 'production') : ?>
+                <div class="<?= APPLICATION_ENV ?>"><?= $this->translate('opus.environment') ?> (<?= APPLICATION_ENV ?>)</div>
+                <?php endif ?>
             </div>
 
             <div id="header">
diff --git a/public/layouts/opus4/css/opus.css b/public/layouts/opus4/css/opus.css
index b95edae9f..da189eaa7 100644
--- a/public/layouts/opus4/css/opus.css
+++ b/public/layouts/opus4/css/opus.css
@@ -1145,3 +1145,12 @@ dl.result_box {
 #appmode-production {
     display: none;
 }
+
+/* Testumgebung */
+#top-header .testing,.staging,.development {
+    color: black;
+    background: #ff5a5a;
+    font-weight:bold;
+    font-size:120%;
+    text-align: center
+}
diff --git a/tests/modules/home/controllers/IndexControllerTest.php b/tests/modules/home/controllers/IndexControllerTest.php
index b6b854584..769106146 100644
--- a/tests/modules/home/controllers/IndexControllerTest.php
+++ b/tests/modules/home/controllers/IndexControllerTest.php
@@ -246,4 +246,34 @@ public function testPageLanguageAttributeGerman() {
         $this->assertXPath('//meta[@http-equiv="Content-Language" and @content="de"]');
     }
 
+    /**
+     * Assumes that test are not run in 'production' environment.
+     */
+    public function testSignalNonProductionEnvironment() {
+        $this->useEnglish();
+
+        $this->dispatch('/home');
+
+        $this->assertQueryContentContains('//div#top-header', 'NON PRODUCTION ENVIRONMENT');
+    }
+
+    /**
+     * No way to change APPLICATION_ENV once it is set. It makes testing 'production' impossible,
+     * but that is a good thing because environment cannot be hidden by some other code.
+     */
+    public function testNoSignalingOfEnvironment() {
+        $this->useEnglish();
+
+        $this->dispatch('/home');
+
+        if (APPLICATION_ENV !== 'production') {
+            $this->assertQueryContentContains(
+                '//div#top-header', 'NON PRODUCTION ENVIRONMENT (' . APPLICATION_ENV . ')'
+            );
+        }
+        else {
+            $this->assertNotQueryContentContains('//div#top-header', 'NON PRODUCTION ENVIRONMENT');
+        }
+    }
+
 }

From f0814057370105538b7d0ef9459c54be2d8ab9f4 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 4 May 2016 17:07:11 +0200
Subject: [PATCH 009/115] OPUSVIER-3524 - Added target to remove missing files
 from testdata (for Test and Selenium instances).

---
 build.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index d83708ad4..256a9bda7 100644
--- a/build.xml
+++ b/build.xml
@@ -222,6 +222,13 @@
         </exec>
     </target>
 
+    <target name="remove-hhar-files">
+        <exec executable="php" dir="${basedir}/scripts" failonerror="true">
+            <arg line="opus-console.php" />
+            <arg line="snippets/delete_files.php" />
+        </exec>
+    </target>
+
     <!--
         requires: version, date, CHANGES and RELEASE_NOTES already updated
         tag release

From 9ddf26c00e4e05d3706af734e9362108e9fb53af Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Wed, 4 May 2016 22:31:10 +0200
Subject: [PATCH 010/115] OPUSVIER-3597 - Prevent composer script from running
 as root. Path argument optional.

---
 bin/install-composer.sh | 19 +++++++++++++++++--
 bin/install.sh          | 14 +++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bin/install-composer.sh b/bin/install-composer.sh
index 41f4732c7..804e7acce 100755
--- a/bin/install-composer.sh
+++ b/bin/install-composer.sh
@@ -30,14 +30,29 @@
 set -e
 
 SCRIPT_NAME="$(basename "$0")"
-BASEDIR="$1"
+SCRIPT_NAME_FULL="`readlink -f "$0"`"
+SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
+
+
+BASEDIR="`dirname "$SCRIPT_PATH"`"
+
+# get BASEDIR from first argument if present
+if [ $# -ge 1 ] ;
+then
+    BASEDIR="$1"
+fi
+
+# Don't run Composer as root - Composer itself warns against that
+if [[ $EUID -eq 0 ]]; then
+    echo -e "\nERROR: This script must not be run as root.\n" 1>&2
+    exit 1
+fi
 
 # create base folder on demand and qualify its pathname
 mkdir -p "$BASEDIR" || exit 1
 cd "$BASEDIR"
 BASEDIR="$(pwd)"
 
-
 if [ -e composer.phar ] ;
 then
 	# upgrade existing composer
diff --git a/bin/install.sh b/bin/install.sh
index 15ea32587..364ac1afb 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -112,7 +112,19 @@ echo
 echo "Installing Composer and dependencies ..."
 echo
 
-"$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
+if [[ $SUDO_ENABLED -eq 0 ]] ;
+then
+    "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
+else
+    if [[ -e $BASEDIR/vendor ]] ;
+    then
+        echo "Skipping composer install/update since script is executed as root."
+        echo "Please run 'bin/install-composer.sh' separately without 'sudo'."
+    else
+        echo "Please run 'bin/install-composer.sh' without 'sudo' before the installation."
+        exit 1;
+    fi
+fi
 
 #
 # Prepare Apache2 configuration

From f716f0465e7ec3fa9ffab434038f2bb8d27a8975 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Wed, 4 May 2016 23:23:45 +0200
Subject: [PATCH 011/115] OPUSVIER-3073 - Added comment.

---
 scripts/common/bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/common/bootstrap.php b/scripts/common/bootstrap.php
index 60e700119..b7567f5b2 100644
--- a/scripts/common/bootstrap.php
+++ b/scripts/common/bootstrap.php
@@ -53,6 +53,7 @@
     || define('APPLICATION_PATH', realpath(dirname(dirname(dirname(__FILE__)))));
 
 // Define application environment
+// TODO scripts using this might be executed with a different environment than requests to the application
 defined('APPLICATION_ENV')
     || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
 

From 010e33a0600a0eec97d387cec3e9bc5f98fc3271 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 9 May 2016 15:26:00 +0200
Subject: [PATCH 012/115] OPUSVIER-3605 - Provide replacement function for
 boolval if not present (in older PHP).

---
 library/Application/Bootstrap.php  |  1 -
 library/opus-php-compatibility.php | 39 ++++++++++++++++++++++++++++++
 public/index.php                   |  5 ++--
 scripts/common/bootstrap.php       |  1 +
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 library/opus-php-compatibility.php

diff --git a/library/Application/Bootstrap.php b/library/Application/Bootstrap.php
index 6ff7f5f13..0bbbb81be 100644
--- a/library/Application/Bootstrap.php
+++ b/library/Application/Bootstrap.php
@@ -323,5 +323,4 @@ protected  function _initVersionInfo() {
         $view->headMeta()->appendName('Opus-Version', Application_Configuration::getOpusVersion());
     }
 
-
 }
diff --git a/library/opus-php-compatibility.php b/library/opus-php-compatibility.php
new file mode 100644
index 000000000..3c6635deb
--- /dev/null
+++ b/library/opus-php-compatibility.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+// Provide boolval function for PHP <5.5
+if (!function_exists('boolval')) {
+    function boolval($value) {
+        return (bool) $value;
+    }
+}
+
diff --git a/public/index.php b/public/index.php
index b427c7742..33083f4cb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -53,8 +53,9 @@
         )));
 
 require_once 'autoload.php';
+require_once 'opus-php-compatibility.php';
 
-///** Zend_Application */
+// Zend_Application
 $config = new Zend_Config_Ini(
         APPLICATION_PATH . '/application/configs/application.ini',
         APPLICATION_ENV,
@@ -77,7 +78,7 @@
     $config->merge($onlineConfig);
 }
 
-//// Create application, bootstrap, and run
+// Create application, bootstrap, and run
 $application = new Zend_Application(APPLICATION_ENV, $config);
 
 try {
diff --git a/scripts/common/bootstrap.php b/scripts/common/bootstrap.php
index 60e700119..3200519dd 100644
--- a/scripts/common/bootstrap.php
+++ b/scripts/common/bootstrap.php
@@ -57,6 +57,7 @@
     || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
 
 require_once 'autoload.php';
+require_once 'opus-php-compatibility.php';
 
 // environment initializiation
 $application = new Zend_Application(

From a94170c94bb7fe7914a33f7412100a559e317c8a Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 10 May 2016 10:36:24 +0200
Subject: [PATCH 013/115] OPUSVIER-3531 - Application auf composer.phar and
 dependencies umgestellt.

---
 build.xml     | 93 ++++++++-------------------------------------------
 composer.json |  6 ++++
 2 files changed, 20 insertions(+), 79 deletions(-)

diff --git a/build.xml b/build.xml
index 256a9bda7..2c20011c2 100644
--- a/build.xml
+++ b/build.xml
@@ -2,12 +2,11 @@
 <project name="opus4server" default="build">
 
     <property environment="env" />
-    <property name="workspace" value="${env.WORKSPACE}" /><!-- Wird von Jenkins gesetzt. -->
-    <property name="configfile" location="${workspace}/../opus-config.properties" />
-    <property name="libsdir" location="/home/opus4ci/libs" />
+    <property name="configfile" location="${basedir}/../opus-config.properties" />
     <property name="testpath" value="" />
     <property name="codingstandard" location="${basedir}/vendor/opus4-repo/codesniffer/ruleset.xml" />
     <property name="adminPassword" value="AdminAdmin" />
+    <property name="bindir" value="${basedir}/vendor/bin" />
 
     <target name="analyse-code" depends="phpcs,phpmd,phpcpd,phploc" />
 
@@ -63,19 +62,15 @@
     </target>
 
     <target name="prepare-dependencies">
-        <exec executable="composer">
-            <arg value="install" />
-        </exec>
-        <exec executable="composer">
-            <arg value="update" />
-        </exec>
+        <exec executable="${basedir}/bin/install-composer.sh" />
         <symlink link="${basedir}/db/schema" resource="${basedir}/vendor/opus4-repo/framework/db/schema"
                  failonerror="false" />
     </target>
 
     <target name="prepare-javascript">
         <mkdir dir="${basedir}/public/js" />
-        <symlink link="${basedir}/public/js/jquery.js" resource="${libsdir}/jquery.js" failonerror="false" />
+        <symlink link="${basedir}/public/js/jquery.js" resource="${basedir}/components/jquery/jquery.js"
+                 failonerror="false" />
     </target>
 
     <target name="prepare-config" description="Prepares the configuration files">
@@ -107,7 +102,7 @@
     </target>
 
     <target name="phploc" description="">
-        <exec executable="phploc">
+        <exec executable="${bindir}/phploc">
             <arg value="--log-csv" />
             <arg value="${basedir}/build/logs/phploc.csv" />
             <arg path="${basedir}/modules" /> <!-- TODO library code -->
@@ -115,7 +110,7 @@
     </target>
 
     <target name="phpdoc">
-        <exec executable="phpdoc" dir="${basedir}" logerror="on">
+        <exec executable="${bindir}/phpdoc" dir="${basedir}" logerror="on">
             <arg value="--directory" />
             <arg path="${basedir}/modules" />
             <arg value="--target" />
@@ -125,7 +120,7 @@
 
     <target name="phpcs">
         <echo message="Coding Standard = '${codingstandard}'" />
-        <exec executable="phpcs" dir="${basedir}" output="${basedir}/build/logs/checkstyle.xml"
+        <exec executable="${bindir}/phpcs" dir="${basedir}" output="${basedir}/build/logs/checkstyle.xml"
               error="${basedir}/build/logs/checkstyle-error.log">
             <arg value="--report=checkstyle" />
             <arg value="--standard=${codingstandard}" />
@@ -138,13 +133,13 @@
     </target>
 
     <target name="phpmd">
-        <exec executable="phpmd" dir="${basedir}" logerror="on" output="${basedir}/build/logs/pmd.xml" >
+        <exec executable="${bindir}/phpmd" dir="${basedir}" logerror="on" output="${basedir}/build/logs/pmd.xml" >
             <arg line="--exclude tests . xml codesize,unusedcode,naming,design" />
         </exec>
     </target>
 
     <target name="phpcpd">
-        <exec executable="phpcpd" dir="${basedir}" logerror="on" >
+        <exec executable="${bindir}/phpcpd" dir="${basedir}" logerror="on" >
             <arg line="--min-lines 3" />
             <arg line="--min-tokens 30" />
             <arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml" />
@@ -153,7 +148,7 @@
     </target>
 
     <target name="pdepend" depends="phpunit" description="Generates software metrics charts.">
-        <exec executable="pdepend" dir="${basedir}" logerror="on">
+        <exec executable="${bindir}/pdepend" dir="${basedir}" logerror="on">
             <arg line="--coverage-report=${basedir}/build/logs/phpunit.coverage.xml" />
             <arg line="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
             <arg line="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
@@ -166,7 +161,7 @@
     </target>
 
     <target name="phpcb" description="Aggregates tool output with PHP_CodeBrowser.">
-        <exec executable="phpcb">
+        <exec executable="${bindir}/phpcb">
             <arg value="--log" />
             <arg path="${basedir}/build/logs" />
             <arg value="--source" />
@@ -187,7 +182,7 @@
     </target>
 
     <target name="phpunit" depends="rebuild-database,rebuild-index" description="Runs unit tests with coverage">
-        <exec executable="${basedir}/vendor/bin/phpunit" dir="${basedir}/tests" failonerror="true">
+        <exec executable="${bindir}/phpunit" dir="${basedir}/tests" failonerror="true">
             <arg line="--log-junit ${basedir}/build/logs/phpunit.xml" />
             <arg line="--coverage-clover ${basedir}/build/logs/phpunit.coverage.xml" />
             <arg line="--coverage-html ${basedir}/build/coverage" />
@@ -197,7 +192,7 @@
     </target>
 
     <target name="phpunit-fast" depends="rebuild-database,rebuild-index" description="Runs unit tests without coverage">
-        <exec executable="${basedir}/vendor/bin/phpunit" dir="${basedir}/tests" failonerror="true">
+        <exec executable="${bindir}/phpunit" dir="${basedir}/tests" failonerror="true">
             <arg line="--log-junit ${basedir}/build/logs/phpunit.xml" />
             <arg line="--configuration phpunit.xml" />
             <arg line="${testpath}" />
@@ -229,64 +224,4 @@
         </exec>
     </target>
 
-    <!--
-        requires: version, date, CHANGES and RELEASE_NOTES already updated
-        tag release
-        build tarball
-        copy, encode, commit CHANGES/RELEASE_NOTES
-    -->
-    <target name="prepare-release-check">
-        <condition property="runPrepareRelease">
-            <and>
-                <isset property="releaseVersion" />
-                <isset property="releaseTag" />
-                <!-- TODO check existence of tag -->
-            </and>
-        </condition>
-    </target>
-
-    <!-- TODO  tagging: releaseDate -->
-    <target name="tag-release" depends="prepare-release-check" if="runPrepareRelease">
-        <exec executable="./tag-release.sh" dir="${basedir}/scripts/packaging">
-            <arg line="${releaseDate}" />
-            <arg line="${releaseVersion}" />
-        </exec>
-    </target>
-
-    <target name="prepare-release-notes">
-        <mkdir dir="${basedir}/build/release" />
-
-        <!-- prepare website files -->
-        <copy file="/CHANGES.txt"
-              tofile="${basedir}/build/release/CHANGES.txt"
-              filtering="true" encoding="UTF-8" outputencoding="ISO-8859-1" />
-        <copy file="/RELEASE_NOTES.txt"
-              tofile="${basedir}/build/release/RELEASE_NOTES.txt"
-              filtering="true" encoding="UTF-8" outputencoding="ISO-8859-1" />
-    </target>
-
-    <target name="prepare-release" depends="prepare-release-check" if="runPrepareRelease"
-            description="Builds release files (tarball, CHANGES, RELEASE_NOTES)">
-        <echo message="Preparing release files ..." />
-
-        <mkdir dir="${basedir}/build/release" />
-
-        <!-- build tarball -->
-        <exec executable="./prepare_tarball.sh" dir="${basedir}/scripts/packaging" failonerror="true">
-            <arg line="tags/${releaseTag}" />
-            <arg line="opus-${releaseVersion}" />
-        </exec>
-
-        <!-- Move release files to build folder. -->
-        <move todir="${basedir}/build/release">
-            <fileset dir="${basedir}/scripts/packaging">
-                <include name="opus-${releaseVersion}.*" />
-            </fileset>
-        </move>
-
-        <delete dir="${basedir}/scripts/packaging/opus-${releaseVersion}" />
-
-        <!-- TODO  commit website files to svn -->
-    </target>
-
 </project>
diff --git a/composer.json b/composer.json
index 42d765cea..5f6173f19 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,12 @@
     "phpunit/phpunit-story": "~1.0",
     "phpunit/phpunit-selenium": "~1.4",
     "phpunit/php-invoker": "~1.1",
+    "phploc/phploc": "*",
+    "phpdocumentor/phpdocumentor": "2.*",
+    "phpmd/phpmd" : "2.4.3",
+    "sebastian/phpcpd": "*",
+    "mayflower/php-codebrowser": "~1.1",
+    "squizlabs/php_codesniffer": "2.*",
     "opus4-repo/codesniffer": "dev-master"
   },
   "minimum-stability": "dev",

From d77cad1ae351523faa78dd6b1910398b8f051403 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 10 May 2016 10:51:18 +0200
Subject: [PATCH 014/115] OPUSVIER-3531 - Update composer dependencies with
 every prepare.

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2c20011c2..f916092bd 100644
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
 
     <target name="setup" depends="prepare-dependencies,prepare-javascript,prepare-config" />
 
-    <target name="prepare" depends="clean">
+    <target name="prepare" depends="clean,prepare-dependencies">
         <mkdir dir="${basedir}/build/logs" />
         <mkdir dir="${basedir}/build/coverage" />
         <mkdir dir="${basedir}/build/api" />

From 4dc9d410199ae890c5e3d5cdce54893b4de8c616 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 10 May 2016 11:37:41 +0200
Subject: [PATCH 015/115] OPUSVIER-3531 - Call to phpmd modifiziert to fix
 hanging build.

---
 build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index f916092bd..bdfcfb308 100644
--- a/build.xml
+++ b/build.xml
@@ -134,7 +134,10 @@
 
     <target name="phpmd">
         <exec executable="${bindir}/phpmd" dir="${basedir}" logerror="on" output="${basedir}/build/logs/pmd.xml" >
-            <arg line="--exclude tests . xml codesize,unusedcode,naming,design" />
+            <arg line="--exclude tests,vendor" />
+            <arg line="." />
+            <arg line="xml" />
+            <arg line="codesize,unusedcode,naming,design" />
         </exec>
     </target>
 

From ccb48b81597c399026fffc44426066b1b7cc2e83 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 10 May 2016 11:51:52 +0200
Subject: [PATCH 016/115] Ignore files in build folder.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6325414a4..93c5e44c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ public/.htaccess
 public/js
 public/series_logos
 
+build/
 tests/build/
 tests/config.ini
 tests/workspace/**/*

From 7b3db9c2dfdb9a1c723b3d6ebe3aa17960380337 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 13 May 2016 15:58:59 +0200
Subject: [PATCH 017/115] OPUSVIER-3015 - Help texts modified to produce valid
 XHTML. Check for English and German.

---
 application/configs/help/metadata.de.txt      | 25 +++++-----
 application/configs/help/metadata.en.txt      | 14 +++---
 .../configs/help/publicationprocess.de.txt    | 12 ++---
 .../configs/help/publicationprocess.en.txt    | 14 +++---
 application/configs/help/searchtipps.de.txt   | 46 ++++++++++++-------
 application/configs/help/searchtipps.en.txt   | 44 ++++++++++++------
 .../home/controllers/IndexControllerTest.php  | 17 +++++--
 7 files changed, 107 insertions(+), 65 deletions(-)

diff --git a/application/configs/help/metadata.de.txt b/application/configs/help/metadata.de.txt
index 241a43490..d26cb40bb 100644
--- a/application/configs/help/metadata.de.txt
+++ b/application/configs/help/metadata.de.txt
@@ -1,17 +1,20 @@
 Metadaten können definiert werden als
+
 <ul>
-<li>Daten, die eine oder mehrere Ressourcen beschreiben</li> oder als
+<li>Daten, die eine oder mehrere Ressourcen beschreiben oder als</li>
 <li>Daten, die mit einem Objekt verbunden sind und dieses Objekt beschreiben</li>
 </ul>
-Prinzipiell stellen Metadaten daher eine Beschreibung von Dokumenten, Objekten oder Diensten dar und 
-enthalten Informationen zu deren Inhalt, Struktur oder Form. Etwas abstrakter formuliert sind Metadaten 
-Beschreibungen von Daten bzw. "Daten über Daten". Bibliographische Datensätze und Katalogeinträge in 
-Bibliotheken können als eine Form von Metadaten gesehen werden.
+
+<p>Prinzipiell stellen Metadaten daher eine Beschreibung von Dokumenten, Objekten oder Diensten dar und
+enthalten Informationen zu deren Inhalt, Struktur oder Form. Etwas abstrakter formuliert sind Metadaten
+Beschreibungen von Daten bzw. "Daten über Daten". Bibliographische Datensätze und Katalogeinträge in
+Bibliotheken können als eine Form von Metadaten gesehen werden.</p>
+
 <p>
 Als Grundlage für die Metadaten auf diesem Dokumentenserver soll das aus fünfzehn Basiselementen
-bestehende <a href="http://dublincore.org/" target="_blank">Dublin Core Metedata Element Set</A> 
-(kurz Dublin Core bzw. DC) dienen. Dublin Core ist das Ergebnis internationaler Bemühungen, einen 
-gemeinsamen Konsens bei der Beschreibung elektronischer Objekte (im weitesten Sinne) zu finden. 
-Die Library of Congress (LoC), das Online Cataloging Library Center (OCLC) und eine Reihe von 
-Nationalbibliotheken setzen sich in Projekten mit Dublin Core auseinander bzw. stehen kurz vor dessen 
-Einführung.
\ No newline at end of file
+bestehende <a href="http://dublincore.org/" target="_blank">Dublin Core Metedata Element Set</a>
+(kurz Dublin Core bzw. DC) dienen. Dublin Core ist das Ergebnis internationaler Bemühungen, einen
+gemeinsamen Konsens bei der Beschreibung elektronischer Objekte (im weitesten Sinne) zu finden.
+Die Library of Congress (LoC), das Online Cataloging Library Center (OCLC) und eine Reihe von
+Nationalbibliotheken setzen sich in Projekten mit Dublin Core auseinander bzw. stehen kurz vor dessen
+Einführung.</p>
diff --git a/application/configs/help/metadata.en.txt b/application/configs/help/metadata.en.txt
index 2235d72d4..e24009034 100644
--- a/application/configs/help/metadata.en.txt
+++ b/application/configs/help/metadata.en.txt
@@ -1,16 +1,16 @@
 Metadata can be defined as
 <ul>
-<li>data describing one or more ressources</li> or as
+<li>data describing one or more ressources or as</li>
 <li>data associated with an object and describing it</li>
 </ul>
-Basically metadata is describing documents, objects or services and contains information about their content, 
-structure or form. More abstractly metadata is a description of data or &quot;data about data&quot;. 
+Basically metadata is describing documents, objects or services and contains information about their content,
+structure or form. More abstractly metadata is a description of data or &quot;data about data&quot;.
 Bibliographic data sets and catalog entries in library catalogs can be seen as a kind of metadata.
 <p>
 This repository is using metadata in the <a href="http://dublincore.org/" target="_blank">Dublin
 Core Metedata Element Set</a> (short Dublin Core (DC)) which has fifteen basic elements. Dublin
-Core is the result of international efforts to reach a collective consensus in describing electronic 
-objects (in the broadest sense). The Library of Congress (LoC), the Online Cataloging Library Center (OCLC) 
-and several national libraries are dealing with Dublin Core in many projects and are close to introduce the 
+Core is the result of international efforts to reach a collective consensus in describing electronic
+objects (in the broadest sense). The Library of Congress (LoC), the Online Cataloging Library Center (OCLC)
+and several national libraries are dealing with Dublin Core in many projects and are close to introduce the
 system respectively.
-</p>
\ No newline at end of file
+</p>
diff --git a/application/configs/help/publicationprocess.de.txt b/application/configs/help/publicationprocess.de.txt
index b03d3b358..f37c2f237 100644
--- a/application/configs/help/publicationprocess.de.txt
+++ b/application/configs/help/publicationprocess.de.txt
@@ -1,8 +1,8 @@
 Klicken Sie auf der Startseite auf Veröffentlichen.<br/>
-Sie werden zunächst aufgefordert, einen Dokumenttyp auszuwählen. Direkt darunter können Sie Ihr(e) Dokument(e) hochladen. Klicken Sie anschließend auf "Abschicken". Es folgt das eigentliche Formular. Hier werden verschiedene Daten zu Ihrer Publikation 
-(sog. Metadaten) abgefragt, die der Beschreibung in Katalogen und anderen bibliographischen Verzeichnissen 
+Sie werden zunächst aufgefordert, einen Dokumenttyp auszuwählen. Direkt darunter können Sie Ihr(e) Dokument(e) hochladen. Klicken Sie anschließend auf "Abschicken". Es folgt das eigentliche Formular. Hier werden verschiedene Daten zu Ihrer Publikation
+(sog. Metadaten) abgefragt, die der Beschreibung in Katalogen und anderen bibliographischen Verzeichnissen
 dienen. Beschreiben Sie hier anhand der vorgegebenen Kategorien das Dokument, das Sie einbringen wollen.
-Abhängig vom Dokumenttyp sind einige der Felder <span class="required">Pflichtfelder</span> und müssen also von Ihnen ausgefüllt werden. 
+Abhängig vom Dokumenttyp sind einige der Felder <span class="required">Pflichtfelder</span> und müssen also von Ihnen ausgefüllt werden.
 Machen Sie ansonsten so genaue Angaben wie möglich.
 Zum Beispiel werden erfasst:<br/>
 <ul>
@@ -14,7 +14,7 @@ Zum Beispiel werden erfasst:<br/>
 <li>die Lizenz, unter der Sie Ihr Dokument veröffentlichen wollen (aus einer Liste auszuwählen)</li>
 </ul>
 Wenn Sie nicht wissen, was Sie in einem Formularfeld eintragen sollen, fahren Sie bitte mit dem Cursor über das Eingabefeld. Es wird ein erläuternder Hilfetext eingeblendet (Tooltip).<br/>
-Zum Abschluss der Datenerfassung werden Ihnen Ihre Eingaben noch einmal angezeigt und Sie haben drei Möglichkeiten: Sie können die Eingaben zu Ihrem Dokument gegebenenfalls korrigieren, 
-es einer Sammlung (Collection) hinzufügen oder direkt abspeichern.<br><br/>
+Zum Abschluss der Datenerfassung werden Ihnen Ihre Eingaben noch einmal angezeigt und Sie haben drei Möglichkeiten: Sie können die Eingaben zu Ihrem Dokument gegebenenfalls korrigieren,
+es einer Sammlung (Collection) hinzufügen oder direkt abspeichern.<br/><br/>
 <b>Hinweis:</b><br/>
-Cookies müssen im Webbrowser eingeschaltet sein, um Dokumente über das Veröffentlichungsformular einstellen zu können.
\ No newline at end of file
+Cookies müssen im Webbrowser eingeschaltet sein, um Dokumente über das Veröffentlichungsformular einstellen zu können.
diff --git a/application/configs/help/publicationprocess.en.txt b/application/configs/help/publicationprocess.en.txt
index 42fe663e2..7f67a4904 100644
--- a/application/configs/help/publicationprocess.en.txt
+++ b/application/configs/help/publicationprocess.en.txt
@@ -1,8 +1,8 @@
 Please click on the publication link on the start page.<br/>
-First you are requested to choose a document type. Right beneath that you can upload your document files. Having done so you may click on "send". What follows now is the actual form. 
-You have to fill in data about your publication here (so called metadata), which is used to describe your work in catalouges and other bibliographic 
-directories. Describe the document you want to upload using the categories and fields on the publication form. Depending on the document type, some of 
-these fields are <span class="required">mandatory</span> and therefore have to be filled in. Please describe your document as clear as possible. 
+First you are requested to choose a document type. Right beneath that you can upload your document files. Having done so you may click on "send". What follows now is the actual form.
+You have to fill in data about your publication here (so called metadata), which is used to describe your work in catalouges and other bibliographic
+directories. Describe the document you want to upload using the categories and fields on the publication form. Depending on the document type, some of
+these fields are <span class="required">mandatory</span> and therefore have to be filled in. Please describe your document as clear as possible.
 Mandatory fields are for example:<br/>
 <ul>
 <li>the document type (must be choosen from a list)</li>
@@ -13,7 +13,7 @@ Mandatory fields are for example:<br/>
 <li>the licence, under which you want to publish your document (must be choosen from a list)</li>
 </ul>
 If you are unsure what to fill in certain form fields, you can point the cursor on a field and an explaining help text will be shown.<br/>
-After you have finished the form, all data will be displayed once again for a check-up and you then have three possibilities: you can correct them if necessary, add your document to a 
-collection or simply safe it directly.<br><br/>
+After you have finished the form, all data will be displayed once again for a check-up and you then have three possibilities: you can correct them if necessary, add your document to a
+collection or simply safe it directly.<br /><br/>
 <b>Note:</b><br/>
-In oder to publish your work cookies have to be enabled in your web browser.
\ No newline at end of file
+In oder to publish your work cookies have to be enabled in your web browser.
diff --git a/application/configs/help/searchtipps.de.txt b/application/configs/help/searchtipps.de.txt
index 6b85554b3..785c48cac 100644
--- a/application/configs/help/searchtipps.de.txt
+++ b/application/configs/help/searchtipps.de.txt
@@ -1,20 +1,34 @@
 <h4>Boolesche Operatoren <b>AND</b>, <b>OR</b>, <b>NOT</b></h4>
-<p>Bei der <b>Einfachen Suche</b> werden mehrere Suchbegriffe automatisch mit <b>und</b> verknüpft. Für eine gezieltere Suche empfiehlt es sich mit 
-Hilfe der Booleschen Operatoren mehrere Suchbegriffe miteinander zu verknüpfen.</p>
+
+<p>Bei der <b>Einfachen Suche</b> werden mehrere Suchbegriffe automatisch mit <b>und</b> verknüpft. Für eine gezieltere
+Suche empfiehlt es sich mit Hilfe der Booleschen Operatoren mehrere Suchbegriffe miteinander zu verknüpfen.</p>
+
 <p><b>AND:</b> Alle eingegebenen Suchwörter müssen im Dokument vorkommen.</p>
-<p><b>OR:</b> Nur einer der eingegebenen Suchbegriffe muss im Dokument vorkommen. Diese Funktion erweitert den Suchbereich und bietet sich an, 
-wenn unterschiedliche Bezeichnungen zu einem Thema existieren.</p>
-<blockquote>Orange <b>OR</b> Apfelsine</blockquote>
-<p><b>NOT:</b> Diese Funktion hat eine ausschließende Wirkung und kann benutzt werden, um die Treffermenge einzuschränken: In Dokumenten, in 
-denen der eine Suchbegriff vorkommt, darf der andere nicht vorkommen.</p>
-<blockquote>Orange <b>NOT</b> Apfelsine</blockquote>
-<p>Die Booleschen Operatoren funktionieren auch für die <b>Erweiterte Suche</b>. Dort können sie benutzt werden, um verschiedene Suchbegriffe innerhalb
-eines Suchfelds miteinander zu kombinieren. Zum Beispiel liefert die folgende Suchanfrage alle Dokumente des Autors "Mustermann" für die Jahre 2002 oder 2003: 
-<blockquote> Autor: Mustermann <br> Jahr: 2002 <b>OR</b> 2003
-</blockquote>
+
+<p><b>OR:</b> Nur einer der eingegebenen Suchbegriffe muss im Dokument vorkommen. Diese Funktion erweitert den
+Suchbereich und bietet sich an, wenn unterschiedliche Bezeichnungen zu einem Thema existieren.</p>
+
+<code>Orange <b>OR</b> Apfelsine</code>
+
+<p><b>NOT:</b> Diese Funktion hat eine ausschließende Wirkung und kann benutzt werden, um die Treffermenge
+einzuschränken: In Dokumenten, in denen der eine Suchbegriff vorkommt, darf der andere nicht vorkommen.</p>
+
+<code>Orange <b>NOT</b> Apfelsine</code>
+
+<p>Die Booleschen Operatoren funktionieren auch für die <b>Erweiterte Suche</b>. Dort können sie benutzt werden, um
+verschiedene Suchbegriffe innerhalb eines Suchfelds miteinander zu kombinieren. Zum Beispiel liefert die folgende
+Suchanfrage alle Dokumente des Autors "Mustermann" für die Jahre 2002 oder 2003:</p>
+
+<code> Autor: Mustermann <br/> Jahr: 2002 <b>OR</b> 2003</code>
+
 <h4><b>Platzhalter/ Wildcards</b></h4>
-<p>Wenn Sie sich nicht sicher sind, wie ein Suchbegriff, beispielsweise ein Name, geschrieben wird, oder wenn Sie ihre Suche erweitern möchten, 
-können Sie <b>*</b> und <b>?</b> als Wildcard verwenden. Es ist nicht möglich, diese am Beginn eines Suchbegriffes zu verwenden.</p>
-<blockquote>Beispiel 1: "Biblio<b>*</b>" findet "Bibliothekar", "Bibliothek" oder auch "bibliothekarisch".</blockquote>
-<blockquote>Beispiel 2: "Ma<b>?</b>er" findet "Mayer", "Maier" oder auch "Mager" und "Maler".</blockquote>
+
+<p>Wenn Sie sich nicht sicher sind, wie ein Suchbegriff, beispielsweise ein Name, geschrieben wird, oder wenn Sie
+ihre Suche erweitern möchten, können Sie <b>*</b> und <b>?</b> als Wildcard verwenden. Es ist nicht möglich, diese am
+Beginn eines Suchbegriffes zu verwenden.</p>
+
+<div><code>Beispiel 1: "Biblio<b>*</b>" findet "Bibliothekar", "Bibliothek" oder auch "bibliothekarisch".</code></div>
+
+<div><code>Beispiel 2: "Ma<b>?</b>er" findet "Mayer", "Maier" oder auch "Mager" und "Maler".</code></div>
+
 <p>Sie können doppelte Anführungszeichen (") benutzen, um eine Phrasensuche durchzuführen.</p>
diff --git a/application/configs/help/searchtipps.en.txt b/application/configs/help/searchtipps.en.txt
index 70b0b7444..366dc655b 100644
--- a/application/configs/help/searchtipps.en.txt
+++ b/application/configs/help/searchtipps.en.txt
@@ -1,19 +1,33 @@
 <h4>Boolean Operators <b>AND</b>, <b>OR</b>, <b>NOT</b></h4>
-<p>When you use the <b>Simple Search</b>, all terms are combined by <b>AND</b> automatically. For a more tightly focused search you may use the 
-Boolean Operators to combine different search terms.</p>
+
+<p>When you use the <b>Simple Search</b>, all terms are combined by <b>AND</b> automatically. For a more tightly
+focused search you may use the Boolean Operators to combine different search terms.</p>
+
 <p><b>AND:</b> The document has to contain all search terms.</p>
-<p><b>OR:</b> The document has to contain one of the search terms. This function broadens your search and is recommended, when there are 
-different terms for the same meaning.</p>
-<blockquote>article <b>OR</b> paper</blockquote>
-<p><b>NOT:</b> This function works excluding and might be useful to reduce a large result list: Documents, which contain the one term, may not contain 
-the other.</p>
-<blockquote>article <b>NOT</b> paper</blockquote>
-The Boolean Operators work for the <b>Advanced Search</b> as well. You may use them to combine different search terms within one search field. For example,
-to search for documents of the author "Doe" in the years 2002 or 2003, use the query:
-<blockquote>Author: Doe <br> Year: 2002 <b>OR</b> 2003</blockquote>
+
+<p><b>OR:</b> The document has to contain one of the search terms. This function broadens your search and is
+recommended, when there are different terms for the same meaning.</p>
+
+<div><code>article <b>OR</b> paper</code></div>
+
+<p><b>NOT:</b> This function works excluding and might be useful to reduce a large result list: Documents, which
+contain the one term, may not contain the other.</p>
+
+<div><code>article <b>NOT</b> paper</code></div>
+
+<p>The Boolean Operators work for the <b>Advanced Search</b> as well. You may use them to combine different search
+terms within one search field. For example, to search for documents of the author "Doe" in the years 2002 or 2003,
+use the query:</p>
+
+<code>Author: Doe <br /> Year: 2002 <b>OR</b> 2003</code>
+
 <h4>Wildcards</h4>
-<p>In the field 'Search:', you may use the symbols '*' and '?' as wildcards. Use them in place of a character or characters that are unknown or that 
-may differ. You cannot use them in front of a word or search string.</p>
-<blockquote>Example 1: <b>chemi*</b> finds <i>chemical</i> but also <i>chemistry</i> or <i>chemist</i>.</blockquote>
-<blockquote>Example 2: <b>licen?e</b> finds <i>licence</i> and <i>license</i>.</blockquote>
+
+<p>In the field 'Search:', you may use the symbols '*' and '?' as wildcards. Use them in place of a character or
+characters that are unknown or that may differ. You cannot use them in front of a word or search string.</p>
+
+<code>Example 1: <b>chemi*</b> finds <i>chemical</i> but also <i>chemistry</i> or <i>chemist</i>.</code>
+
+<code>Example 2: <b>licen?e</b> finds <i>licence</i> and <i>license</i>.</code>
+
 <p>You may use double quotes (") to search for phrases.</p>
diff --git a/tests/modules/home/controllers/IndexControllerTest.php b/tests/modules/home/controllers/IndexControllerTest.php
index 769106146..5803c4f22 100644
--- a/tests/modules/home/controllers/IndexControllerTest.php
+++ b/tests/modules/home/controllers/IndexControllerTest.php
@@ -53,17 +53,27 @@ public function testIndexAction() {
     /**
      * Test help action.
      */
-    public function testHelpAction() {
+    public function testHelpActionEnglish() {
+        $this->useEnglish();
+        $this->dispatch('/home/index/help');
+        $this->assertResponseCode(200);
+        $this->assertModule('home');
+        $this->assertController('index');
+        $this->assertAction('help');
+        $this->validateXHTML();
+    }
+
+    public function testHelpActionGerman() {
+        $this->useGerman();
         $this->dispatch('/home/index/help');
         $this->assertResponseCode(200);
         $this->assertModule('home');
         $this->assertController('index');
         $this->assertAction('help');
-        // $this->validateXHTML(); TODO viele Anpassungen in Hilfedateien (DE, EN)
+        $this->validateXHTML();
     }
 
     public function testHelpActionSeparate() {
-        $this->markTestSkipped('Is *help.separate* parameter still supported?');
         $config = Zend_Registry::get('Zend_Config');
         $config->help->separate = true;
         $this->dispatch('/home/index/help');
@@ -71,6 +81,7 @@ public function testHelpActionSeparate() {
         $this->assertModule('home');
         $this->assertController('index');
         $this->assertAction('help');
+        $this->validateXHTML();
     }
 
     /**

From 85139b40dae126ef335992a2f2cb5489cec03a87 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 13 May 2016 17:25:22 +0200
Subject: [PATCH 018/115] OPUSVIER-2511 - Added method for setting hostname and
 base URL for a test.

---
 tests/modules/ControllerTestCaseTest.php | 30 +++++++++++++++++++++-
 tests/support/ControllerTestCase.php     | 32 +++++++++++++++++++++---
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/tests/modules/ControllerTestCaseTest.php b/tests/modules/ControllerTestCaseTest.php
index f70fd8bfd..b80de9b10 100644
--- a/tests/modules/ControllerTestCaseTest.php
+++ b/tests/modules/ControllerTestCaseTest.php
@@ -61,4 +61,32 @@ public function testTearDownDidLogout() {
         $this->assertNotContains('administrator', $realm->getRoles());
     }
 
-}
\ No newline at end of file
+    public function testSetHostname() {
+        $view = Zend_Registry::get('Opus_View');
+
+        $this->assertEquals('http://', $view->serverUrl());
+
+        $this->setHostname('localhost');
+
+        $this->assertEquals('http://localhost', $view->serverUrl());
+    }
+
+    public function testSetBaseUrlNotSet() {
+        $view = Zend_Registry::get('Opus_View');
+
+        $this->assertEquals('', $view->baseUrl());
+
+        // base Url must be set before first baseUrl() call, won't be changed afterwards
+        $this->setBaseUrl('opus4');
+        $this->assertEquals('', $view->baseUrl());
+    }
+
+    public function testSetBaseUrlSet() {
+        $view = Zend_Registry::get('Opus_View');
+
+        $this->setBaseUrl('opus4');
+
+        $this->assertEquals('opus4', $view->baseUrl());
+    }
+
+}
diff --git a/tests/support/ControllerTestCase.php b/tests/support/ControllerTestCase.php
index ff269ddab..56bc76647 100644
--- a/tests/support/ControllerTestCase.php
+++ b/tests/support/ControllerTestCase.php
@@ -188,12 +188,13 @@ public function logoutUser() {
 
     /**
      * Check if Solr-Config is given, otherwise skip the tests.
+     *
+     * TODO check behavior of getServiceConfiguration
      */
     protected function requireSolrConfig() {
-        $config = Zend_Registry::get('Zend_Config');
-        if (!isset($config->searchengine->index->host) ||
-            !isset($config->searchengine->index->port) ||
-            !isset($config->searchengine->index->app)) {
+        $config = Opus_Search_Config::getServiceConfiguration(Opus_Search_Service::SERVICE_TYPE_INDEX);
+
+        if (is_null($config)) {
             $this->markTestSkipped('No solr-config given.  Skipping test.');
         }
     }
@@ -598,4 +599,27 @@ public function resetSearch() {
         Opus_Search_Service::dropCached();
     }
 
+    /**
+     * Sets the hostname for a test.
+     * @param $host string Hostname for tests
+     * @throws Zend_Exception
+     */
+    public function setHostname($host) {
+        $view = Zend_Registry::get('Opus_View');
+        $view->getHelper('ServerUrl')->setHost($host);
+    }
+
+    /**
+     * Sets base URL for tests.
+     *
+     * A lot of tests fail if the base URL is set because they verify URLs from the server root, like '/auth' instead
+     * of 'opus4/auth' (base URL = 'opus4').
+     *
+     * @param $baseUrl string Base URL for tests
+     * @throws Zend_Controller_Exception
+     */
+    public function setBaseUrl($baseUrl) {
+        Zend_Controller_Front::getInstance()->setBaseUrl($baseUrl);
+    }
+
 }

From f36a92a5a45fb106ed271c8465a0288cc2feab88 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 13 May 2016 17:42:39 +0200
Subject: [PATCH 019/115] OPUSVIER-3542 - Fixed broken tests. Made XHTML valid.

---
 library/Application/Configuration.php                  | 2 +-
 modules/admin/views/scripts/info/index.phtml           | 2 ++
 tests/modules/admin/controllers/InfoControllerTest.php | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Application/Configuration.php b/library/Application/Configuration.php
index 6cc2d85f2..638e0f103 100644
--- a/library/Application/Configuration.php
+++ b/library/Application/Configuration.php
@@ -231,7 +231,7 @@ public static function getOpusVersion() {
      */
     public static function getOpusInfo() {
         $info = array();
-        // OPUSVIER-3542 deaktiviert: $info['admin_info_version'] = self::getOpusVersion();
+        $info['admin_info_version'] = self::getOpusVersion();
         return $info;
     }
 
diff --git a/modules/admin/views/scripts/info/index.phtml b/modules/admin/views/scripts/info/index.phtml
index 9ac0ecfc1..1ab344c93 100644
--- a/modules/admin/views/scripts/info/index.phtml
+++ b/modules/admin/views/scripts/info/index.phtml
@@ -33,12 +33,14 @@
  */
 ?>
 
+<?PHP if (!empty(Application_Configuration::getOpusInfo())) : ?>
 <dl>
     <?PHP foreach (Application_Configuration::getOpusInfo() as $infoKey => $infoValue) : ?>
         <dt id="<?= $infoKey ?>"><?= htmlspecialchars($this->translate($infoKey)) ?></dt>
         <dd><?= $infoValue ?></dd>
     <?PHP endforeach ?>
 </dl>
+<?PHP endif ?>
 
 <?PHP /* OPUSVIER-3542 deaktiviert
 <dl>
diff --git a/tests/modules/admin/controllers/InfoControllerTest.php b/tests/modules/admin/controllers/InfoControllerTest.php
index 6b8ead60c..814f28dbe 100644
--- a/tests/modules/admin/controllers/InfoControllerTest.php
+++ b/tests/modules/admin/controllers/InfoControllerTest.php
@@ -33,14 +33,14 @@
  * @version     $Id$
  */
 class Admin_InfoControllerTest extends ControllerTestCase {
-    
+
     public function testIndexDisplayVersion() {
         $config = Zend_Registry::get('Zend_Config');
         $this->dispatch('admin/info');
-        $this->validateXHTML();
         $this->assertResponseCode(200);
         $this->assertQuery('dt#admin_info_version');
         $this->assertQueryContentContains("//dt[@id='admin_info_version']/following-sibling::dd", $config->version);
+        $this->validateXHTML();
     }
 
     /**

From 4823147331d74da3afbe04ef94d35f6b45232427 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 13 May 2016 18:19:47 +0200
Subject: [PATCH 020/115] OPUSVIER-3542 - Set version number.

---
 application/configs/application.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/configs/application.ini b/application/configs/application.ini
index e6f8c32db..5c233f387 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -77,7 +77,7 @@ theme = opus4
 name = 'OPUS 4'
 security = 1
 workspacePath = APPLICATION_PATH "/workspace"
-version = trunk
+version = 4.5.0-DEV
 update.latestVersionCheckUrl = "http://www.kobv.de/fileadmin/opus/download/VERSION.txt"
 
 ; OAI SETTINGS

From 24b7048ef9604fcfb112b0959cc14837b68aaa04 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 17 May 2016 16:29:11 +0200
Subject: [PATCH 021/115] OPUSVIER-3542 - Check for latest release on GitHub.

---
 application/configs/application.ini           |  2 +-
 .../Controller/Action/Helper/Version.php      | 29 ++++++++++++++++---
 modules/admin/views/scripts/info/index.phtml  |  2 --
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/application/configs/application.ini b/application/configs/application.ini
index 5c233f387..d7c17e8f9 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -78,7 +78,7 @@ name = 'OPUS 4'
 security = 1
 workspacePath = APPLICATION_PATH "/workspace"
 version = 4.5.0-DEV
-update.latestVersionCheckUrl = "http://www.kobv.de/fileadmin/opus/download/VERSION.txt"
+update.latestVersionCheckUrl = "https://api.github.com/repos/opus4/application/releases/latest"
 
 ; OAI SETTINGS
 oai.repository.name =
diff --git a/library/Application/Controller/Action/Helper/Version.php b/library/Application/Controller/Action/Helper/Version.php
index 76772e496..e299936a4 100644
--- a/library/Application/Controller/Action/Helper/Version.php
+++ b/library/Application/Controller/Action/Helper/Version.php
@@ -66,9 +66,30 @@ public function setVersion($version) {
      * TODO Exception handling for connection problems (e.g. not found)
      */
     public function getLatestReleaseFromServer() {
-        $versionFileContent = file_get_contents(Zend_Registry::get('Zend_Config')->update->latestVersionCheckUrl);
-        $fileContentArray = explode("\n", $versionFileContent);
-        return $fileContentArray[0];
+        $latestUrl = Zend_Registry::get('Zend_Config')->update->latestVersionCheckUrl;
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_URL, $latestUrl);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'OPUS 4');
+        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        $response = curl_exec($ch);
+        curl_close($ch);
+
+        if (!$response) {
+            // TODO no response
+            return "online check failed";
+        }
+
+        $data = json_decode($response);
+        if (isset($data->tag_name)) {
+            $version = $data->tag_name;
+        }
+        else {
+            $version = 'unknown';
+        }
+        return $version;
     }
 
-}
\ No newline at end of file
+}
diff --git a/modules/admin/views/scripts/info/index.phtml b/modules/admin/views/scripts/info/index.phtml
index 1ab344c93..ed4c6d7f0 100644
--- a/modules/admin/views/scripts/info/index.phtml
+++ b/modules/admin/views/scripts/info/index.phtml
@@ -42,12 +42,10 @@
 </dl>
 <?PHP endif ?>
 
-<?PHP /* OPUSVIER-3542 deaktiviert
 <dl>
     <dt><a href="<?= $this->url(array('module' => 'admin', 'controller' => 'info', 'action' => 'update')) ?>">
         <?= htmlspecialchars($this->translate('admin_info_versioncheck')) ?></a></dt>
 </dl>
- */ ?>
 
 <fieldset>
     <legend><?= $this->translate('admin_info_section_upload') ?></legend>

From 7a5831d3a1271c752fbb5898e89285f1ebe64a85 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 17 May 2016 16:58:31 +0200
Subject: [PATCH 022/115] =?UTF-8?q?OPUSVIER-3542=20-=20Verfeinerte=20Pr?=
 =?UTF-8?q?=C3=BCfung=20auf=20veraltete=20Version.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/admin/controllers/InfoController.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/admin/controllers/InfoController.php b/modules/admin/controllers/InfoController.php
index f709b797b..d6e0548e1 100644
--- a/modules/admin/controllers/InfoController.php
+++ b/modules/admin/controllers/InfoController.php
@@ -73,8 +73,24 @@ public function updateAction() {
             $this->view->message = $this->view->translate('admin_info_version_current');
         }
         else {
-            $this->view->message = $this->view->translate('admin_info_version_outdated');
-            $this->view->latestVersion = $latestVersion;
+            if (strpos($localVersion, 'DEV') === false) {
+                if (version_compare($localVersion, $latestVersion) >= 0) {
+                    $this->view->message = $this->view->translate('admin_info_version_current');
+                }
+                else {
+                    $this->view->message = $this->view->translate('admin_info_version_outdated');
+                    $this->view->latestVersion = $latestVersion;
+                }
+            }
+            else {
+                if (version_compare(substr($localVersion, 0, 5), substr($latestVersion, 0, 5)) < 0) {
+                    $this->view->message = $this->view->translate('admin_info_version_outdated');
+                    $this->view->latestVersion = $latestVersion;
+                }
+                else {
+                    $this->view->message = $this->view->translate('admin_info_version_current');
+                }
+            }
         }
     }
 

From 92fc4e59656a665fe27bcbaa80f370098a033aea Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 2 Jun 2016 12:08:11 +0200
Subject: [PATCH 023/115] OPUSVIER-3617 - Added SQL_MODE to create documents
 without server_date_created.

---
 tests/sql/992_create_documents_testdata__security.sql           | 2 ++
 tests/sql/993_create_documents_testdata__date.sql               | 2 ++
 tests/sql/994_create_documents_testdata__file.sql               | 2 ++
 .../sql/995_create_documents_testdata__serverstate-deleted.sql  | 2 ++
 .../996_create_documents_testdata__serverstate-unpublished.sql  | 2 ++
 ...create_documents_testdata__one_published_doc_per_doctype.sql | 2 ++
 tests/sql/999_create_documents_testdata__formatting.sql         | 2 ++
 ...create_documents_testdata__frontdoor-display-collections.sql | 2 ++
 .../sql/999_create_documents_testdata__multiple_identifiers.sql | 2 ++
 tests/sql/999_create_documents_testdata__series.sql             | 2 ++
 tests/sql/999_create_documents_testdata__special-characters.sql | 2 ++
 .../sql/999_create_documents_testdata__thesis-year-accepted.sql | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/tests/sql/992_create_documents_testdata__security.sql b/tests/sql/992_create_documents_testdata__security.sql
index 6f4becbab..417b7c08a 100644
--- a/tests/sql/992_create_documents_testdata__security.sql
+++ b/tests/sql/992_create_documents_testdata__security.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (111, NULL, 2035, NULL, NULL, '2010-09-26', 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2008, '', NULL, '2010-06-04T02:36:53Z', '2010-03-05T09:47:22Z', 'published', NULL, 0);
 
diff --git a/tests/sql/993_create_documents_testdata__date.sql b/tests/sql/993_create_documents_testdata__date.sql
index 44ca5ee8b..fda87e389 100644
--- a/tests/sql/993_create_documents_testdata__date.sql
+++ b/tests/sql/993_create_documents_testdata__date.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (112, '2011-04-19', 2011, NULL, NULL, NULL, 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, NULL, '', NULL, '2010-06-04T02:36:53Z', '2010-03-05T09:47:22Z', 'published', NULL, 0),
 (113, '2011-04-19', 2011, NULL, NULL, NULL, 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', '2010-04-19', NULL, '', NULL, '2010-06-04T02:36:53Z', '2010-03-05T09:47:22Z', 'published', NULL, 0),
diff --git a/tests/sql/994_create_documents_testdata__file.sql b/tests/sql/994_create_documents_testdata__file.sql
index cf6c4bf83..668d4bf02 100644
--- a/tests/sql/994_create_documents_testdata__file.sql
+++ b/tests/sql/994_create_documents_testdata__file.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (120, NULL, 2011, NULL, NULL, NULL, 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2010, '', NULL, '2010-06-04T02:36:53Z', '2010-03-05T09:47:22Z', 'published', NULL, 0),
 (121, NULL, 2011, NULL, NULL, NULL, 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2010, '', NULL, '2010-06-04T02:36:53Z', '2010-03-05T09:47:22Z', 'published', NULL, 0),
diff --git a/tests/sql/995_create_documents_testdata__serverstate-deleted.sql b/tests/sql/995_create_documents_testdata__serverstate-deleted.sql
index 03fc2aebf..53ce0e3bb 100644
--- a/tests/sql/995_create_documents_testdata__serverstate-deleted.sql
+++ b/tests/sql/995_create_documents_testdata__serverstate-deleted.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (123, NULL, 2011, NULL, NULL, '2011-09-26', 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2011, '', NULL, '2011-06-04T02:36:53Z', '2110-03-05T09:47:22Z', 'deleted', NULL, 0);
 
diff --git a/tests/sql/996_create_documents_testdata__serverstate-unpublished.sql b/tests/sql/996_create_documents_testdata__serverstate-unpublished.sql
index 15f832d1d..893547ced 100644
--- a/tests/sql/996_create_documents_testdata__serverstate-unpublished.sql
+++ b/tests/sql/996_create_documents_testdata__serverstate-unpublished.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (124, NULL, 2011, NULL, NULL, '2011-09-26', 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2011, '', NULL, '2011-06-04T02:36:53Z', '2110-03-05T09:47:22Z', 'unpublished', NULL, 0);
 
diff --git a/tests/sql/997_create_documents_testdata__one_published_doc_per_doctype.sql b/tests/sql/997_create_documents_testdata__one_published_doc_per_doctype.sql
index 3af8346f4..b401ac223 100644
--- a/tests/sql/997_create_documents_testdata__one_published_doc_per_doctype.sql
+++ b/tests/sql/997_create_documents_testdata__one_published_doc_per_doctype.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (125, NULL, 2011, NULL, NULL, '2011-09-26', 'article', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2011, '', NULL, '2011-06-04T02:36:53Z', '2011-03-05T09:47:22Z', 'published', NULL, 0),
 (126, NULL, 2011, NULL, NULL, '2011-09-26', 'bachelorthesis', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2011, '', NULL, '2011-06-04T02:36:53Z', '2011-03-05T09:47:22Z', 'published', NULL, 0),
diff --git a/tests/sql/999_create_documents_testdata__formatting.sql b/tests/sql/999_create_documents_testdata__formatting.sql
index cbea24790..2332e218a 100644
--- a/tests/sql/999_create_documents_testdata__formatting.sql
+++ b/tests/sql/999_create_documents_testdata__formatting.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (170, NULL, 2013, NULL, NULL, NULL, 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2013, '', NULL, '2013-09-13T12:00:00Z', '2013-09-13T12:00:00Z', 'unpublished', NULL, 0);
 
diff --git a/tests/sql/999_create_documents_testdata__frontdoor-display-collections.sql b/tests/sql/999_create_documents_testdata__frontdoor-display-collections.sql
index 5405f0418..68495893d 100644
--- a/tests/sql/999_create_documents_testdata__frontdoor-display-collections.sql
+++ b/tests/sql/999_create_documents_testdata__frontdoor-display-collections.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_year_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (151, NULL, 2012, NULL, NULL, '2012', 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-01-16T19:23:14Z', '2012-01-16T19:23:14Z', 'published', NULL, 0);
 
diff --git a/tests/sql/999_create_documents_testdata__multiple_identifiers.sql b/tests/sql/999_create_documents_testdata__multiple_identifiers.sql
index a8039518e..624fd7bf1 100644
--- a/tests/sql/999_create_documents_testdata__multiple_identifiers.sql
+++ b/tests/sql/999_create_documents_testdata__multiple_identifiers.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_year_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (153, NULL, 2012, NULL, NULL, '2012', 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-01-23T15:23:42Z', '2012-01-23T15:23:42Z', 'published', NULL, 0);
 
diff --git a/tests/sql/999_create_documents_testdata__series.sql b/tests/sql/999_create_documents_testdata__series.sql
index 32bf9fbc5..9a0693ecc 100644
--- a/tests/sql/999_create_documents_testdata__series.sql
+++ b/tests/sql/999_create_documents_testdata__series.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_year_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (149, NULL, 2012, NULL, NULL, '2012', 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-01-23T15:23:42Z', '2012-01-23T15:23:42Z', 'published', NULL, 0);
 
diff --git a/tests/sql/999_create_documents_testdata__special-characters.sql b/tests/sql/999_create_documents_testdata__special-characters.sql
index 06d8f1891..131b7c7ef 100644
--- a/tests/sql/999_create_documents_testdata__special-characters.sql
+++ b/tests/sql/999_create_documents_testdata__special-characters.sql
@@ -1,3 +1,5 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_date_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (147, NULL, 2012, NULL, NULL, NULL, 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-01-12T11:12:13Z', '2012-01-12T11:12:13Z', 'published', NULL, 0),
 (150, NULL, 2012, NULL, NULL, NULL, 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-06-21T11:57:13Z', '2012-06-21T11:57:13Z', 'published', NULL, 0),
diff --git a/tests/sql/999_create_documents_testdata__thesis-year-accepted.sql b/tests/sql/999_create_documents_testdata__thesis-year-accepted.sql
index e204c4b1b..ad19344e5 100644
--- a/tests/sql/999_create_documents_testdata__thesis-year-accepted.sql
+++ b/tests/sql/999_create_documents_testdata__thesis-year-accepted.sql
@@ -1,2 +1,4 @@
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
 INSERT INTO `documents` (`id`, `completed_date`, `completed_year`, `contributing_corporation`, `creating_corporation`, `thesis_year_accepted`, `type`, `edition`, `issue`, `language`, `page_first`, `page_last`, `page_number`, `publication_state`, `published_date`, `published_year`, `publisher_name`, `publisher_place`, `server_date_modified`, `server_date_published`, `server_state`, `volume`, `belongs_to_bibliography`) VALUES
 (148, NULL, 2012, NULL, NULL, '2012', 'preprint', NULL, NULL, 'deu', NULL, NULL, NULL, 'draft', NULL, 2012, '', NULL, '2012-01-16T19:23:14Z', '2012-01-16T19:23:14Z', 'published', NULL, 0);

From 2d9d9aa6fc8071a1cb2bd65876522fbc35aed4b5 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 2 Jun 2016 12:08:30 +0200
Subject: [PATCH 024/115] OPUSVIER-3617 - Changed quotes.

---
 tests/sql/991_create_documents_testdata__opus4dev.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/sql/991_create_documents_testdata__opus4dev.sql b/tests/sql/991_create_documents_testdata__opus4dev.sql
index 099dc7e69..e9d308e39 100644
--- a/tests/sql/991_create_documents_testdata__opus4dev.sql
+++ b/tests/sql/991_create_documents_testdata__opus4dev.sql
@@ -147,7 +147,7 @@ INSERT INTO `document_title_abstracts` (`id`, `document_id`, `type`, `value`, `l
 (251, 91, 'parent', 'This is a parent title', 'eng'),
 (271, 92, 'abstract', 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.', 'deu'),
 (272, 92, 'abstract', 'Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque.', 'fra'),
-(273, 96, 'abstract', "\\[ \\left( \\sum_{k=1}^n a_k b_k \\right)^2 \\leq \\left( \\sum_{k=1}^n a_k^2 \\right) \\left( \\sum_{k=1}^n b_k^2 \\right) \\]", 'eng');
+(273, 96, 'abstract', '\\[ \\left( \\sum_{k=1}^n a_k b_k \\right)^2 \\leq \\left( \\sum_{k=1}^n a_k^2 \\right) \\left( \\sum_{k=1}^n b_k^2 \\right) \\]', 'eng');
 
 --
 -- Daten für Tabelle `persons`

From 7df3739f88156665e3ba38011a429aaf33de7ece Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 11:16:27 +0200
Subject: [PATCH 025/115] OPUSVIER-3472 - Sortierungsattribut fuer
 Schriftenreihen als Nummer interpretieren.

---
 modules/frontdoor/views/scripts/index/index.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 042ce54f7..80cbbd535 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -187,7 +187,7 @@
             <xsl:apply-templates select="TitleAdditional" mode="mainLanguage" />
             <xsl:apply-templates select="TitleAdditional" mode="otherLanguage" />
             <xsl:apply-templates select="Series[@Visible=1]" >
-                <xsl:sort select="@SortOrder"/>
+                <xsl:sort select="@SortOrder" data-type="number" />
             </xsl:apply-templates>
             <xsl:apply-templates select="@PublisherName" />
             <xsl:apply-templates select="@PublisherPlace" />

From 25101cfc444e02e4b9aee184d188d2242f9a502d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 13:14:28 +0200
Subject: [PATCH 026/115] OPUSVIER-2196 - Some cleanup.

---
 scripts/opus-create-export-xml.php | 36 +++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/scripts/opus-create-export-xml.php b/scripts/opus-create-export-xml.php
index 4c5243f7f..2b04182ae 100644
--- a/scripts/opus-create-export-xml.php
+++ b/scripts/opus-create-export-xml.php
@@ -25,48 +25,56 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * @category    Application
- * @author      Gunar Maiwald <szott@zib.de>
- * @copyright   Copyright (c) 2011, OPUS 4 development team
+ * @author      Gunar Maiwald <maiwald@zib.de>
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2011-2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
  */
 
 
 /**
- * Tries to export all documents.
+ * Script for exporting all documents.
+ *
+ * TODO move code into classes
+ * TODO add command line parameters
+ * TODO add options for selected export? (only published)
+ * TODO add progress reporting
  */
 
 require_once dirname(__FILE__) . '/common/bootstrap.php';
 
 $config = Zend_Registry::get('Zend_Config');
-$exportFilePath = $config->workspacePath . DIRECTORY_SEPARATOR . "export" . DIRECTORY_SEPARATOR . "export.xml";
+$exportPath = $config->workspacePath . DIRECTORY_SEPARATOR . "export";
+$exportFilePath = $exportPath . DIRECTORY_SEPARATOR . "export.xml";
 
 // Exception if not writeable
 try {
-    if (!is_writeable($exportFilePath)) {
-        throw new Exception('exportfile is not writeable');
+    if (!is_writeable($exportPath)) {
+        throw new Exception("export folder is not writeable ($exportPath)");
+    }
+    if (file_exists($exportFilePath)) {
+        throw new Exception("export file already exists ($exportFilePath)");
     }
 } catch (Exception $e) {
-    echo $e;
-    exit();
+    echo $e->getMessage() . PHP_EOL;
+    exit(1);
 }
 
-
-$docFinder = new Opus_DocumentFinder();
 $opusDocuments = new DOMDocument('1.0', 'utf-8');
 $opusDocuments->formatOutput = true; 
 $export = $opusDocuments->createElement('export');
 
 $docFinder = new Opus_DocumentFinder();
 
+// get all documents
 foreach ($docFinder->ids() as $id) {
-
     $doc = null;
+
     try {
         $doc = new Opus_Document($id);
     }
     catch (Opus_Model_NotFoundException $e) {
-        // document with id $id does not exist
+        echo "Document with id $id does not exist." . PHP_EOL;
         continue;
     }
 
@@ -74,6 +82,7 @@
     $xmlModelOutput->setModel($doc);
     $xmlModelOutput->setStrategy(new Opus_Model_Xml_Version1());
     $xmlModelOutput->excludeEmptyFields();
+
     $domDocument = $xmlModelOutput->getDomDocument();
     $opusDocument = $domDocument->getElementsByTagName('Opus_Document')->item(0);
     $node = $opusDocuments->importNode($opusDocument, true);
@@ -82,6 +91,7 @@
 
 $opusDocuments->appendChild($export);
 
+// write XML to export file
 $exportFile= fopen($exportFilePath, 'w');
 fputs($exportFile, $opusDocuments->saveXML());
 fclose($exportFile);

From fc9e848d11fdd6baf29f4af2552490e1f76e545c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 13:42:02 +0200
Subject: [PATCH 027/115] OPUSVIER-2196 - Parameter '-o' for output file. Using
 default document xml.

---
 scripts/opus-create-export-xml.php | 34 ++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/scripts/opus-create-export-xml.php b/scripts/opus-create-export-xml.php
index 2b04182ae..90c9b2441 100644
--- a/scripts/opus-create-export-xml.php
+++ b/scripts/opus-create-export-xml.php
@@ -35,8 +35,9 @@
 /**
  * Script for exporting all documents.
  *
+ * TODO more cleanup
  * TODO move code into classes
- * TODO add command line parameters
+ * TODO add command line parameters, e.g. export target
  * TODO add options for selected export? (only published)
  * TODO add progress reporting
  */
@@ -44,8 +45,27 @@
 require_once dirname(__FILE__) . '/common/bootstrap.php';
 
 $config = Zend_Registry::get('Zend_Config');
-$exportPath = $config->workspacePath . DIRECTORY_SEPARATOR . "export";
-$exportFilePath = $exportPath . DIRECTORY_SEPARATOR . "export.xml";
+
+// process options
+$options = getopt('o:');
+
+if (array_key_exists('o', $options)) {
+    $exportFilePath = $options['o'];
+    $exportPath = dirname($exportFilePath);
+    $exportFilePath = basename($exportFilePath);
+
+    // if path is not absolute use export folder
+    if ($exportPath === '.') {
+        $exportPath = $config->workspacePath . DIRECTORY_SEPARATOR . "export";
+    }
+}
+else {
+    $exportFilePath = 'export.xml';
+    $exportPath = $config->workspacePath . DIRECTORY_SEPARATOR . "export";
+}
+
+$exportFilePath = $exportPath . DIRECTORY_SEPARATOR . $exportFilePath;
+
 
 // Exception if not writeable
 try {
@@ -78,12 +98,7 @@
         continue;
     }
 
-    $xmlModelOutput = new Opus_Model_Xml();
-    $xmlModelOutput->setModel($doc);
-    $xmlModelOutput->setStrategy(new Opus_Model_Xml_Version1());
-    $xmlModelOutput->excludeEmptyFields();
-
-    $domDocument = $xmlModelOutput->getDomDocument();
+    $domDocument = $doc->toXml();
     $opusDocument = $domDocument->getElementsByTagName('Opus_Document')->item(0);
     $node = $opusDocuments->importNode($opusDocument, true);
     $export->appendChild($node);
@@ -92,6 +107,7 @@
 $opusDocuments->appendChild($export);
 
 // write XML to export file
+echo "Writing export to $exportFilePath ..." . PHP_EOL;
 $exportFile= fopen($exportFilePath, 'w');
 fputs($exportFile, $opusDocuments->saveXML());
 fclose($exportFile);

From 724b9c28b52a3f0132d92183f3c91bee0eec262d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 14:22:13 +0200
Subject: [PATCH 028/115] OPUSVIER-889 - Set admin password during
 installation.

---
 bin/install.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bin/install.sh b/bin/install.sh
index 364ac1afb..f74e215fb 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -268,6 +268,25 @@ LimitString
 
 fi
 
+#
+# Set password for administrator account
+#
+
+while [[ -z $ADMIN_PWD || "$ADMIN_PWD" != "$ADMIN_PWD_VERIFY" ]] ;
+do
+  echo
+  read -p "Please enter password for 'admin' account: " -s ADMIN_PWD
+  echo
+  read -p "Please enter password again: " -s ADMIN_PWD_VERIFY
+  echo
+  if [[ $ADMIN_PWD != $ADMIN_PWD_VERIFY ]] ;
+  then
+    echo "Passwords do not match. Please try again."
+  fi
+done
+
+php $BASEDIR/scripts/change-password.php admin "$ADMIN_PWD"
+
 #
 # Create config.ini and set database related parameters.
 #

From 8d45d98f0c6a5e34aaa5be3adfcc55a75d343181 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 16:52:09 +0200
Subject: [PATCH 029/115] OPUSVIER-922 - Use custorm password form element
 everywhere. Get validation from framework. Use form styling from
 administration for account module.

---
 library/Application/Form/Element/Password.php |  4 ++
 .../admin/controllers/AccountController.php   | 15 +---
 modules/admin/forms/Account.php               | 59 +++++++++++-----
 modules/admin/forms/RolesAbstract.php         |  2 +-
 modules/admin/forms/account.ini               | 70 -------------------
 modules/default/language/account.tmx          |  2 +-
 public/layouts/opus4/common.phtml             |  2 +-
 .../Application/Form/Element/PasswordTest.php |  5 ++
 .../controllers/AccountControllerTest.php     | 10 ++-
 tests/modules/admin/forms/AccountTest.php     | 10 +--
 10 files changed, 66 insertions(+), 113 deletions(-)
 delete mode 100644 modules/admin/forms/account.ini

diff --git a/library/Application/Form/Element/Password.php b/library/Application/Form/Element/Password.php
index df5cc6683..e72196dfa 100644
--- a/library/Application/Form/Element/Password.php
+++ b/library/Application/Form/Element/Password.php
@@ -50,6 +50,10 @@ public function init() {
         $this->addPrefixPath('Application_Form_Decorator', 'Application/Form/Decorator', Zend_Form::DECORATOR);
         $this->setAllowEmpty(false);
         $this->addValidator('stringLength', false, array('min' => 6));
+
+        // framework class Opus_Account determines validation
+        $account = new Opus_Account();
+        $this->addValidator($account->getField('Login')->getValidator());
     }
 
     /**
diff --git a/modules/admin/controllers/AccountController.php b/modules/admin/controllers/AccountController.php
index 466cdb453..3a73a58be 100644
--- a/modules/admin/controllers/AccountController.php
+++ b/modules/admin/controllers/AccountController.php
@@ -151,20 +151,11 @@ public function createAction() {
             $postData = $this->getRequest()->getPost();
 
             if ($accountForm->isValid($postData)) {
-                $login = $postData['username'];
-                $password = $postData['password'];
-                $firstname = $postData['firstname'];
-                $lastname = $postData['lastname'];
-                $email = $postData['email'];
-                $roles = Admin_Form_Account::parseSelectedRoles($postData);
-
                 $account = new Opus_Account();
 
-                $account->setLogin($login);
-                $account->setPassword($password);
-                $account->setFirstName($firstname);
-                $account->setLastName($lastname);
-                $account->setEmail($email);
+                $accountForm->updateModel($account);
+
+                $roles = Admin_Form_Account::parseSelectedRoles($postData);
                 $account->setRole($roles);
 
                 $account->store();
diff --git a/modules/admin/forms/Account.php b/modules/admin/forms/Account.php
index 831018bf9..7408536ea 100644
--- a/modules/admin/forms/Account.php
+++ b/modules/admin/forms/Account.php
@@ -40,6 +40,13 @@
  */
 class Admin_Form_Account extends Admin_Form_RolesAbstract {
 
+    const ELEMENT_LOGIN = 'username';
+    const ELEMENT_FIRST_NAME = 'firstname';
+    const ELEMENT_LAST_NAME = 'lastname';
+    const ELEMENT_EMAIL = 'email';
+    const ELEMENT_PASSWORD = 'password';
+    const ELEMENT_PASSWORD_CONFIRM = 'confirmPassword';
+
     private $_mode;
 
     /**
@@ -47,27 +54,22 @@ class Admin_Form_Account extends Admin_Form_RolesAbstract {
      * @param mixed $id
      */
     public function __construct($id = null) {
+        parent::__construct();
+
         $env = (empty($id)) ? 'new' : 'edit';
 
         $this->_mode = $env;
 
-        $config = new Zend_Config_Ini(
-            APPLICATION_PATH .
-            '/modules/admin/forms/account.ini', $env
-        );
-
-        parent::__construct($config->form->account);
-
         if (!empty($id)) {
             $account = new Opus_Account($id);
 
-            $this->populateFromAccount($account);
+            $this->populateFromModel($account);
 
             // when editing account password isn't required
-            $this->getElement('password')->setRequired(false);
-            $this->getElement('confirmPassword')->setRequired(false);
+            $this->getElement(self::ELEMENT_PASSWORD)->setRequired(false);
+            $this->getElement(self::ELEMENT_PASSWORD_CONFIRM)->setRequired(false);
             // force validation on empty field to check identity to password
-            $this->getElement('confirmPassword')->setAllowEmpty(false);
+            $this->getElement(self::ELEMENT_PASSWORD_CONFIRM)->setAllowEmpty(false);
         }
     }
 
@@ -77,16 +79,27 @@ public function __construct($id = null) {
     public function init() {
         parent::init();
 
-        $this->getElement('username')->addValidator(
+        $this->setLabelPrefix('admin_account_label_');
+        $this->setUseNameAsLabel(true);
+
+        $this->addElement('login', self::ELEMENT_LOGIN);
+
+        $this->getElement(self::ELEMENT_LOGIN)->addValidator(
             new Application_Form_Validate_LoginAvailable(
                 array('ignoreCase' => $this->_mode === 'edit')
             )
         );
 
+        $this->addElement('text', self::ELEMENT_FIRST_NAME);
+        $this->addElement('text', self::ELEMENT_LAST_NAME);
+        $this->addElement('email', self::ELEMENT_EMAIL);
+        $this->addElement('password', self::ELEMENT_PASSWORD);
+        $this->addElement('password', self::ELEMENT_PASSWORD_CONFIRM);
+
         // add password validator
-        $confirmPassword = $this->getElement('confirmPassword');
+        $confirmPassword = $this->getElement(self::ELEMENT_PASSWORD_CONFIRM);
         $passwordValidator = new Application_Form_Validate_Password();
-        $confirmPassword->addValidator($passwordValidator);
+        $confirmPassword->setValidators(array($passwordValidator));
 
         // add form elements for selecting roles
         $this->_addRolesGroup();
@@ -96,11 +109,11 @@ public function init() {
      * Populate the form values from Opus_Account instance.
      * @param <type> $account
      */
-    public function populateFromAccount($account) {
-        $this->getElement('username')->setValue(strtolower($account->getLogin()));
-        $this->getElement('firstname')->setValue($account->getFirstName());
-        $this->getElement('lastname')->setValue($account->getLastName());
-        $this->getElement('email')->setValue($account->getEmail());
+    public function populateFromModel($account) {
+        $this->getElement(self::ELEMENT_LOGIN)->setValue(strtolower($account->getLogin()));
+        $this->getElement(self::ELEMENT_FIRST_NAME)->setValue($account->getFirstName());
+        $this->getElement(self::ELEMENT_LAST_NAME)->setValue($account->getLastName());
+        $this->getElement(self::ELEMENT_EMAIL)->setValue($account->getEmail());
 
         $roles = $account->getRole();
 
@@ -113,4 +126,12 @@ public function populateFromAccount($account) {
         }
     }
 
+    public function updateModel($account) {
+        $account->setLogin($this->getElementValue(self::ELEMENT_LOGIN));
+        $account->setFirstName($this->getElementValue(self::ELEMENT_FIRST_NAME));
+        $account->setLastName($this->getElementValue(self::ELEMENT_LAST_NAME));
+        $account->setEmail($this->getElementValue(self::ELEMENT_EMAIL));
+        $account->setPassword($this->getElementValue(self::ELEMENT_PASSWORD));
+    }
+
 }
diff --git a/modules/admin/forms/RolesAbstract.php b/modules/admin/forms/RolesAbstract.php
index 7a1979f3a..647b26edb 100644
--- a/modules/admin/forms/RolesAbstract.php
+++ b/modules/admin/forms/RolesAbstract.php
@@ -35,7 +35,7 @@
 /**
  * Abstract class for supporting editing of Opus roles in form.
  */
-abstract class Admin_Form_RolesAbstract extends Zend_Form {
+abstract class Admin_Form_RolesAbstract extends Application_Form_Model_Abstract {
 
     protected $_roleGroupLegendKey = 'admin_form_group_roles';
 
diff --git a/modules/admin/forms/account.ini b/modules/admin/forms/account.ini
deleted file mode 100644
index ba2d3d48a..000000000
--- a/modules/admin/forms/account.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-; Account administration form
-[production]
-; general form metainformation
-form.account.method = "post"
-
-; username element
-form.account.elements.username.type = "text"
-form.account.elements.username.options.label = "admin_account_label_login"
-form.account.elements.username.options.validators.regex.validator = "regex"
-form.account.elements.username.options.validators.regex.options.pattern = "/^[a-z0-9@._-]+$/"
-form.account.elements.username.options.validators.strlen.validator = "StringLength"
-form.account.elements.username.options.validators.strlen.options.min = "3"
-form.account.elements.username.options.validators.strlen.options.max = "50"
-form.account.elements.username.options.required = true
-
-form.account.elements.firstname.type='text'
-form.account.elements.firstname.options.label = 'admin_account_label_firstname'
-form.account.elements.firstname.options.required = false
-
-form.account.elements.lastname.type='text'
-form.account.elements.lastname.options.label = 'admin_account_label_lastname'
-form.account.elements.lastname.options.required = false
-
-form.account.elements.email.type='text'
-form.account.elements.email.options.label = 'admin_account_label_email'
-form.account.elements.email.options.validators.email.validator = 'EmailAddress'
-form.account.elements.email.options.required = false
-
-; password element
-form.account.elements.password.type = "password"
-form.account.elements.password.name = "password"
-form.account.elements.password.options.label = "admin_account_label_password"
-form.account.elements.password.options.validators.strlen.validator = "StringLength"
-form.account.elements.password.options.validators.strlen.options.min = "6"
-form.account.elements.password.options.required = true
-
-; confirm password element
-form.account.elements.confirmPassword.type = "password"
-form.account.elements.confirmPassword.options.label = "admin_account_label_confirmpassword"
-form.account.elements.confirmPassword.options.required = true
-
-;form.account.displayGroups.groupPassword.name = 'Password'
-;form.account.displayGroups.groupPassword.elements.password = 'password'
-;form.account.displayGroups.groupPassword.elements.confirmPassword = 'confirmPassword'
-;form.account.displayGroups.groupPassword.options.label = "Password"
-
-;form.account.displayGroups.groupRoles.name = 'Roles'
-;form.account.displayGroups.groupRoles.elements.admin = 'adminRole'
-;form.account.displayGroups.groupRoles.elements.guest = 'guestRole'
-;form.account.displayGroups.groupRoles.options.legend = "Roles"
-
-;form.account.elements.adminRole.type = 'checkbox'
-;form.account.elements.adminRole.options.label = 'Administrator'
-;form.account.elements.guestRole.type = 'checkbox'
-;form.account.elements.guestRole.options.label = 'Guest'
-
-; submit element
-form.account.elements.submit.type = 'submit'
-form.account.elements.submit.options.label = 'admin_form_create'
-form.account.elements.submit.options.order = 10
-
-form.account.elements.cancel.type = 'submit'
-form.account.elements.cancel.options.label = 'admin_form_cancel'
-form.account.elements.cancel.options.order = 11
-
-[new : production]
-
-[edit : production]
-
-form.account.elements.submit.options.label = 'admin_form_update'
diff --git a/modules/default/language/account.tmx b/modules/default/language/account.tmx
index 94a052efe..dfa8945a7 100644
--- a/modules/default/language/account.tmx
+++ b/modules/default/language/account.tmx
@@ -50,7 +50,7 @@
       </tuv>
     </tu>
 
-    <tu tuid="admin_account_label_confirmpassword">
+    <tu tuid="admin_account_label_confirmPassword">
       <tuv xml:lang="en">
         <seg>Confirm password:</seg>
       </tuv>
diff --git a/public/layouts/opus4/common.phtml b/public/layouts/opus4/common.phtml
index 7495381b2..dc51ac82a 100755
--- a/public/layouts/opus4/common.phtml
+++ b/public/layouts/opus4/common.phtml
@@ -169,7 +169,7 @@ if (isset($config->javascript->latex->mathjax)) {
                 </div>
             </div>
 
-            <div id="content" class="opus <?= (in_array($this->moduleName, array('admin', 'review', 'setup'))) ? 'adminContainer' : ''?> <?= $this->moduleName ?><?php if ($this->moduleName === 'publish') : ?>"><?php else : ?><?= ($this->controllerName === 'index' ? '' : '_'.$this->controllerName)?><?= ($this->actionName === 'index' ? '' : '_'.$this->actionName)?><?= ($this->searchType === 'collection' || $this->searchType === 'latest' ? ' '.$this->searchType : '') ?>"><?php  endif; ?>
+            <div id="content" class="opus <?= (in_array($this->moduleName, array('admin', 'review', 'setup', 'account'))) ? 'adminContainer' : ''?> <?= $this->moduleName ?><?php if ($this->moduleName === 'publish') : ?>"><?php else : ?><?= ($this->controllerName === 'index' ? '' : '_'.$this->controllerName)?><?= ($this->actionName === 'index' ? '' : '_'.$this->actionName)?><?= ($this->searchType === 'collection' || $this->searchType === 'latest' ? ' '.$this->searchType : '') ?>"><?php  endif; ?>
 
                 <?PHP $messages = !is_null($this->flashMessenger) ? $this->flashMessenger->getMessages() : null ?>
 
diff --git a/tests/library/Application/Form/Element/PasswordTest.php b/tests/library/Application/Form/Element/PasswordTest.php
index 06ba4f12b..4fbca6493 100644
--- a/tests/library/Application/Form/Element/PasswordTest.php
+++ b/tests/library/Application/Form/Element/PasswordTest.php
@@ -46,6 +46,10 @@ public function testValidationSuccess() {
         $element = $this->getElement();
 
         $this->assertTrue($element->isValid('123456'));
+        $this->assertTrue($element->isValid('12@456'));
+        $this->assertTrue($element->isValid('123456.'));
+        $this->assertTrue($element->isValid('abcdef'));
+        $this->assertTrue($element->isValid('abc56def'));
     }
 
     public function testValidationFailure() {
@@ -53,6 +57,7 @@ public function testValidationFailure() {
 
         $this->assertFalse($element->isValid(''));
         $this->assertFalse($element->isValid('12345'));
+        $this->assertFalse($element->isValid('123456%'));
     }
 
 }
diff --git a/tests/modules/admin/controllers/AccountControllerTest.php b/tests/modules/admin/controllers/AccountControllerTest.php
index e975f949a..0703d18ff 100644
--- a/tests/modules/admin/controllers/AccountControllerTest.php
+++ b/tests/modules/admin/controllers/AccountControllerTest.php
@@ -36,6 +36,14 @@
  */
 class Admin_AccountControllerTest extends ControllerTestCase {
 
+    public static function tearDownAfterClass() {
+        // even if something fails, the created test account won't be left in database
+        $account = Opus_Account::fetchAccountByLogin('wally');
+        if ($account instanceof Opus_Account) {
+            $account->delete();
+        }
+    }
+
     /**
      * Tests routing to and successfull execution of 'index' action.
      */
@@ -111,7 +119,7 @@ public function testEditActionWithoutId() {
      * FIXME cancel form for now, since creating account results in database lock timeout
      */
     public function testCreateAction() {
-         $this->request
+         $this->getRequest()
                 ->setMethod('POST')
                 ->setPost(array(
                     'username' => 'wally',
diff --git a/tests/modules/admin/forms/AccountTest.php b/tests/modules/admin/forms/AccountTest.php
index 71132e8de..faf0f1331 100644
--- a/tests/modules/admin/forms/AccountTest.php
+++ b/tests/modules/admin/forms/AccountTest.php
@@ -140,10 +140,7 @@ public function testValidationMissmatchedPasswords() {
 
         $this->assertFalse($form->isValid($postData));
 
-        $errors = $form->getErrors();
-
-        $this->assertTrue(isset($errors['confirmPassword']));
-        $this->assertTrue(in_array('notMatch', $errors['confirmPassword']));
+        $this->assertContains('notMatch', $form->getErrors('confirmPassword'));
     }
 
     public function testValidationBadEmail() {
@@ -159,10 +156,7 @@ public function testValidationBadEmail() {
 
         $this->assertFalse($form->isValid($postData));
 
-        $errors = $form->getErrors();
-
-        $this->assertTrue(isset($errors['email']));
-        $this->assertTrue(in_array('emailAddressInvalidFormat', $errors['email']));
+        $this->assertContains('emailAddressInvalidFormat', $form->getErrors('email'));
     }
 
 }

From cd55f3d6375b09853e9060886ce96c2cc6fac633 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 16:53:16 +0200
Subject: [PATCH 030/115] OPUSVIER-922 - Modified appearance of personal
 account form.

---
 modules/account/forms/Account.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/account/forms/Account.php b/modules/account/forms/Account.php
index ffe467963..600ca7ad3 100644
--- a/modules/account/forms/Account.php
+++ b/modules/account/forms/Account.php
@@ -32,7 +32,7 @@
  * @version     $Id$
  */
 
-class Account_Form_Account extends Application_Form_Abstract {
+class Account_Form_Account extends Application_Form_Model_Abstract {
 
     const ELEMENT_LOGIN = 'username';
     const ELEMENT_FIRSTNAME = 'firstname';
@@ -45,13 +45,6 @@ class Account_Form_Account extends Application_Form_Abstract {
     public function init() {
         parent::init();
 
-        $this->setDecorators(
-            array(
-                'FormElements',
-                'Form'
-            )
-        );
-
         $this->setUseNameAsLabel(true);
         $this->setLabelPrefix('admin_account_label_');
 
@@ -68,7 +61,7 @@ public function init() {
 
         $this->addElement('Password', self::ELEMENT_PASSWORD);
         $this->addElement('Password', self::ELEMENT_CONFIRM_PASSWORD, array(
-            'label' => 'admin_account_label_confirmpassword'
+            'label' => 'admin_account_label_confirmPassword'
         ));
 
         $this->getElement(self::ELEMENT_CONFIRM_PASSWORD)->addValidator(
@@ -78,8 +71,6 @@ public function init() {
         $this->getElement(self::ELEMENT_PASSWORD)->addErrorMessages(
             array(Zend_Validate_StringLength::TOO_SHORT => 'admin_account_error_password_tooshort')
         );
-
-        $this->addElement('Submit', self::ELEMENT_SUBMIT, array('label' => 'account_form_save'));
     }
 
     /**
@@ -111,5 +102,9 @@ public function populateFromModel($account) {
         }
     }
 
+    public function updateModel($account) {
+
+    }
+
 }
 

From 79d5d0850cc43b9cd15eb2659fef1359aecc164c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 16:56:48 +0200
Subject: [PATCH 031/115] OPUSVIER-922 - Use javascript for admin theme for
 account module.

---
 public/layouts/opus4/common.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/layouts/opus4/common.phtml b/public/layouts/opus4/common.phtml
index dc51ac82a..12996d1dc 100755
--- a/public/layouts/opus4/common.phtml
+++ b/public/layouts/opus4/common.phtml
@@ -75,7 +75,7 @@ $this->container = Zend_Registry::get('Opus_Navigation');
 
 $jsFiles = array('searchutil.js', 'frontdoorutil.js', 'submit.js');
 
-if (in_array($this->moduleName, array('admin', 'review', 'setup'))) {
+if (in_array($this->moduleName, array('admin', 'review', 'setup', 'account'))) {
     $jsFiles[] = 'theme.js';
     $jsFiles[] = 'theme_lic.js';
 }

From c5d9d493e4fb426663ea1bc6bc73c7be7ccadd7d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 17:03:17 +0200
Subject: [PATCH 032/115] OPUSVIER-922 - Removed character restrictions from
 password. Added comment to login element.

---
 library/Application/Form/Element/Login.php    | 1 +
 library/Application/Form/Element/Password.php | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/Application/Form/Element/Login.php b/library/Application/Form/Element/Login.php
index b32229610..77f219700 100644
--- a/library/Application/Form/Element/Login.php
+++ b/library/Application/Form/Element/Login.php
@@ -38,6 +38,7 @@
  * Used in forms that allow setting or modifying the login name.
  *
  * TODO reconsider the pattern for login names
+ * TODO depends on framework right now
  */
 class Application_Form_Element_Login extends Application_Form_Element_Text {
 
diff --git a/library/Application/Form/Element/Password.php b/library/Application/Form/Element/Password.php
index e72196dfa..f768b6348 100644
--- a/library/Application/Form/Element/Password.php
+++ b/library/Application/Form/Element/Password.php
@@ -51,9 +51,6 @@ public function init() {
         $this->setAllowEmpty(false);
         $this->addValidator('stringLength', false, array('min' => 6));
 
-        // framework class Opus_Account determines validation
-        $account = new Opus_Account();
-        $this->addValidator($account->getField('Login')->getValidator());
     }
 
     /**

From 2816549099d4f0ac7598df6c7512bcbc4a8f42df Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 12 Aug 2016 17:10:00 +0200
Subject: [PATCH 033/115] OPUSVIER-922 - Added comment to reference duplicate
 validation in framework.

---
 library/Application/Form/Element/Login.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Application/Form/Element/Login.php b/library/Application/Form/Element/Login.php
index 77f219700..22c03c031 100644
--- a/library/Application/Form/Element/Login.php
+++ b/library/Application/Form/Element/Login.php
@@ -48,7 +48,10 @@ class Application_Form_Element_Login extends Application_Form_Element_Text {
     public function init() {
         parent::init();
         $this->setLabel('admin_account_label_login');
+
+        // NOTE: This validation is also defined in Opus_Account.
         $this->addValidator('regex', false, array('/^[a-z0-9@._-]+$/'));
+
         $this->addValidator('stringLength', false, array('min' => 3, 'max' => 50));
         $this->setRequired(true);
     }

From 8a09e7c86971295988e21ce03f6240ad9a1b13e6 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 16 Aug 2016 15:37:14 +0200
Subject: [PATCH 034/115] OPUSVIER-3636 - Authors indexed as "lastname,
 firstname". Semicolon to separate authors in display of search results.

---
 application/configs/solr/solr.xslt                   | 4 ++--
 modules/solrsearch/views/scripts/index/results.phtml | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/configs/solr/solr.xslt b/application/configs/solr/solr.xslt
index bd02fb673..53c53829a 100644
--- a/application/configs/solr/solr.xslt
+++ b/application/configs/solr/solr.xslt
@@ -136,9 +136,9 @@
                 <xsl:for-each select="/Opus/Opus_Document/PersonAuthor">
                     <xsl:element name="field">
                         <xsl:attribute name="name">author</xsl:attribute>
-                        <xsl:value-of select="@FirstName" />
-                        <xsl:text> </xsl:text>
                         <xsl:value-of select="@LastName" />
+                        <xsl:text>, </xsl:text>
+                        <xsl:value-of select="@FirstName" />
                     </xsl:element>
                 </xsl:for-each>
 
diff --git a/modules/solrsearch/views/scripts/index/results.phtml b/modules/solrsearch/views/scripts/index/results.phtml
index 528677250..35d0ccd8d 100644
--- a/modules/solrsearch/views/scripts/index/results.phtml
+++ b/modules/solrsearch/views/scripts/index/results.phtml
@@ -135,10 +135,11 @@ if($this->jQueryEnabled()) {
                         </dt>
                         <?php if (!is_null($result->getAsset( 'author' ))) : ?>
                             <dt class="results_author">
-                                <?php foreach($result->getAsset( 'author' ) as $author) :
-                                   $authorSearch = $this->authorSearch;
-                                   $authorSearch['author'] = '"'.$author.'"';
+                                <?php foreach($result->getAsset( 'author' ) as $authorIndex => $author) :
+                                    $authorSearch = $this->authorSearch;
+                                    $authorSearch['author'] = '"'.$author.'"';
                                 ?>
+                                    <?PHP if ($authorIndex !== 0) : ?> ; <?PHP endif ?>
                                     <a href="<?= $this->url($authorSearch, null, true); ?>"><?= htmlspecialchars($author) ?></a>
                                 <?php endforeach ?>
                             </dt>

From 72d024fdcd9e6d14f7faedf9caf10776d569dec8 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 24 Aug 2016 14:13:23 +0200
Subject: [PATCH 035/115] OPUSVIER-3347 - Try using document objects directly
 again for removal. Added unit tests.

---
 tests/modules/ControllerTestCaseTest.php | 37 ++++++++++++++++++++++++
 tests/support/ControllerTestCase.php     | 12 ++++----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/tests/modules/ControllerTestCaseTest.php b/tests/modules/ControllerTestCaseTest.php
index b80de9b10..62f940105 100644
--- a/tests/modules/ControllerTestCaseTest.php
+++ b/tests/modules/ControllerTestCaseTest.php
@@ -89,4 +89,41 @@ public function testSetBaseUrlSet() {
         $this->assertEquals('opus4', $view->baseUrl());
     }
 
+    /**
+     * Test removing document using identifier.
+     *
+     * @expectedException Opus_Model_NotFoundException
+     */
+    public function testRemoveDocumentById() {
+        $doc = new Opus_Document();
+        $docId = $doc->store();
+
+        $this->removeDocument($docId);
+
+        $doc = new Opus_Document($docId);
+    }
+
+    /**
+     * Test removing document using object.
+     *
+     * @expectedException Opus_Model_NotFoundException
+     */
+    public function testRemoveDocument() {
+        $doc = new Opus_Document();
+        $docId = $doc->store();
+
+        $this->removeDocument($doc);
+
+        $doc = new Opus_Document($docId);
+    }
+
+    /**
+     * Test removing document that has not been stored.
+     */
+    public function testRemoveDocumentNotStored() {
+        $doc = new Opus_Document();
+
+        $this->removeDocument($doc);
+    }
+
 }
diff --git a/tests/support/ControllerTestCase.php b/tests/support/ControllerTestCase.php
index 56bc76647..d309e9503 100644
--- a/tests/support/ControllerTestCase.php
+++ b/tests/support/ControllerTestCase.php
@@ -502,16 +502,16 @@ public function dumpBody() {
         Zend_Debug::dump($this->getResponse()->getBody());
     }
 
+    /**
+     * Removes a test document from the database.
+     * @param $value Opus_Document|int
+     */
     public function removeDocument($value) {
         if (!is_null($value)) {
             try {
                 // check if value is Opus_Document or ID
-                $doc = ($value instanceof Opus_Document) ? new Opus_Document($value->getId()) : new Opus_Document($value);
-
-                // if (!$doc->isNewRecord()) {
-                    // only delete if document has been stored
-                    $doc->deletePermanent();
-                // }
+                $doc = ($value instanceof Opus_Document) ? $value : new Opus_Document($value);
+                $doc->deletePermanent();
             }
             catch (Opus_Model_NotFoundException $omnfe) {
                 // Model nicht gefunden -> alles gut (hoffentlich)

From 5206d9433cc421828292e747563e158f56a0a436 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 24 Aug 2016 15:10:34 +0200
Subject: [PATCH 036/115] OPUSVIER-3542 - Update check switched to GitHub.
 Always show most recent OPUS version.

---
 modules/admin/controllers/InfoController.php  | 8 +++++---
 modules/admin/views/scripts/info/update.phtml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/admin/controllers/InfoController.php b/modules/admin/controllers/InfoController.php
index d6e0548e1..2fb74806e 100644
--- a/modules/admin/controllers/InfoController.php
+++ b/modules/admin/controllers/InfoController.php
@@ -58,13 +58,15 @@ public function indexAction() {
      * Zeigt an, ob eine neuere Version von OPUS verfügbar ist.
      *
      * TODO Behandlung von is_null($latestVersion) hängt vom Verhalten der Version Helpers ab (ueberarbeiten)
+     * TODO move comparison code into non-controller class, e.g. Application_Configuration
      */
     public function updateAction() {
         $localVersion = Application_Configuration::getOpusVersion();
         $latestVersion = $this->_helper->version();
 
         $this->view->currentVersion = $localVersion;
-        $this->view->latestVersion = null;
+        $this->view->latestVersion = $latestVersion;
+        $this->view->showUpdateLink = false;
 
         if (is_null($latestVersion)) {
             $this->view->message = $this->view->translate('admin_info_version_error_getting_latest');
@@ -79,13 +81,13 @@ public function updateAction() {
                 }
                 else {
                     $this->view->message = $this->view->translate('admin_info_version_outdated');
-                    $this->view->latestVersion = $latestVersion;
+                    $this->view->showUpdateLink = true;
                 }
             }
             else {
                 if (version_compare(substr($localVersion, 0, 5), substr($latestVersion, 0, 5)) < 0) {
                     $this->view->message = $this->view->translate('admin_info_version_outdated');
-                    $this->view->latestVersion = $latestVersion;
+                    $this->view->showUpdateLink = true;
                 }
                 else {
                     $this->view->message = $this->view->translate('admin_info_version_current');
diff --git a/modules/admin/views/scripts/info/update.phtml b/modules/admin/views/scripts/info/update.phtml
index a0991dc8d..0c5f49b6f 100644
--- a/modules/admin/views/scripts/info/update.phtml
+++ b/modules/admin/views/scripts/info/update.phtml
@@ -44,7 +44,7 @@
 <div>
     <?= $this->message ?>
 
-    <?PHP if (!is_null($this->latestVersion)) : ?>
+    <?PHP if ($this->showUpdateLink) : ?>
         <a href="http://www.kobv.de/opus4/software/"><?= $this->translate('admin_info_version_get_update') ?></a>
     <?PHP endif; ?>
 </div>
\ No newline at end of file

From cb9def20b3929ec4ed6c25a07bce0782801d77a5 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 24 Aug 2016 15:14:04 +0200
Subject: [PATCH 037/115] OPUSVIER-3542 - Link to update page in user
 documentation.

---
 modules/admin/views/scripts/info/update.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/admin/views/scripts/info/update.phtml b/modules/admin/views/scripts/info/update.phtml
index 0c5f49b6f..5452d3c86 100644
--- a/modules/admin/views/scripts/info/update.phtml
+++ b/modules/admin/views/scripts/info/update.phtml
@@ -45,6 +45,6 @@
     <?= $this->message ?>
 
     <?PHP if ($this->showUpdateLink) : ?>
-        <a href="http://www.kobv.de/opus4/software/"><?= $this->translate('admin_info_version_get_update') ?></a>
+        <a href="http://opus4.github.io/userdoc/update/"><?= $this->translate('admin_info_version_get_update') ?></a>
     <?PHP endif; ?>
 </div>
\ No newline at end of file

From bc5d1a5b56f4fa7e142c28a1482a2e5063920e08 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 24 Aug 2016 15:40:34 +0200
Subject: [PATCH 038/115] OPUSVIER-3616 - Accounts "user" and "referee" removed
 from master data. Not needed for production.

---
 db/masterdata/004_create_user_accounts.sql | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/masterdata/004_create_user_accounts.sql b/db/masterdata/004_create_user_accounts.sql
index f35e1bd46..28c8193e4 100644
--- a/db/masterdata/004_create_user_accounts.sql
+++ b/db/masterdata/004_create_user_accounts.sql
@@ -3,14 +3,10 @@
 -- Create user accounts
 -- 
 INSERT INTO `accounts` (`id`, `login`, `password`) VALUES
-(1, 'user',    sha1('useruser')),
-(2, 'admin',   sha1('adminadmin')),
-(4, 'referee', sha1('refereereferee'));
+(1, 'admin',   sha1('adminadmin'));
 
 --
 -- Assign Roles to Accounts
 --
 INSERT INTO `link_accounts_roles` (`account_id`, `role_id`) VALUES
-(1, 2), -- "user" has role "guest"
-(2, 1), -- "admin" has role "admin"
-(4, 4); -- "referee" has role "reviewer"
+(1, 1); -- "admin" has role "admin"

From cd346aef26e5c86783ba43c284f831b2516c308c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 25 Aug 2016 16:48:01 +0200
Subject: [PATCH 039/115] OPUSVIER-3638 - Option for clearing cache added to
 SolrIndexBuilder script.

---
 scripts/SolrIndexBuilder.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/scripts/SolrIndexBuilder.php b/scripts/SolrIndexBuilder.php
index e6dee9806..8ac89aedb 100755
--- a/scripts/SolrIndexBuilder.php
+++ b/scripts/SolrIndexBuilder.php
@@ -74,6 +74,12 @@ class SolrIndexBuilder {
      */
     private $_showHelp = false;
 
+    /**
+     * Flag for deleting document xml cache before indexing.
+     * @var bool
+     */
+    private $_clearCache = false;
+
     /**
      * Prints a help message to the console.
      */
@@ -83,7 +89,7 @@ private function printHelpMessage($argv) {
             "This program can be used to build up an initial Solr index (e.g., useful when migrating instances)" .
             PHP_EOL .
             PHP_EOL .
-            "Usage: " . $argv[0] . " [starting with ID] [ending with ID]" . PHP_EOL .
+            "Usage: " . $argv[0] . " [-c] [starting with ID] [ending with ID]" . PHP_EOL .
             PHP_EOL .
             "[starting with ID] If system aborted indexing at some ID, you can restart this command by supplying" .
             " this parameter." . PHP_EOL .
@@ -95,7 +101,9 @@ private function printHelpMessage($argv) {
             PHP_EOL .
             "In case both parameters are not specified the currently used index is deleted before insertion of new" .
             " documents begins." . PHP_EOL .
-            PHP_EOL
+            PHP_EOL .
+            'You can use option \'-c\' to clear the document XML cache entries of the documents before indexing.' .
+            PHP_EOL . PHP_EOL
         );
     }
 
@@ -107,6 +115,10 @@ private function evaluateArguments($argc, $argv) {
             $this->_showHelp = true;
         }
         else {
+            if (true === in_array('-c', $argv)) {
+                $this->_clearCache = true;
+            }
+
             if ($argc >= 2) {
                 $this->_start = $argv[1];
             }
@@ -165,9 +177,15 @@ private function index($startId, $endId) {
 
         // measure time for each document
 
+        $cache = new Opus_Model_Xml_Cache();
+
         foreach ($docIds as $docId) {
             $timeStart = microtime(true);
 
+            if ($this->_clearCache) {
+                $cache->removeAllEntriesWhereDocumentId($docId);
+            }
+
             $doc = new Opus_Document($docId);
 
             // dirty hack: disable implicit reindexing of documents in case of cache misses

From 87def5ae2490ed60f4eabf51f114434b892f92ff Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 25 Aug 2016 17:08:02 +0200
Subject: [PATCH 040/115] OPUSVIER-3620 - Bug fixed. Basic unit tests.

---
 modules/oai/models/Error.php           |  2 +-
 tests/modules/oai/models/ErrorTest.php | 50 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/oai/models/ErrorTest.php

diff --git a/modules/oai/models/Error.php b/modules/oai/models/Error.php
index d328a4fa4..0c1d99eec 100644
--- a/modules/oai/models/Error.php
+++ b/modules/oai/models/Error.php
@@ -65,7 +65,7 @@ class Oai_Model_Error {
      */
     public static function mapCode($code) {
         if (false === array_key_exists($code, self::$_oaiErrorCodes)) {
-                throw new Oai_Model_Exception($e->getMessage());
+                throw new Oai_Model_Exception("Unknown oai error code $code");
         }
 
         return self::$_oaiErrorCodes[$code];
diff --git a/tests/modules/oai/models/ErrorTest.php b/tests/modules/oai/models/ErrorTest.php
new file mode 100644
index 000000000..b4285f2e7
--- /dev/null
+++ b/tests/modules/oai/models/ErrorTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Oai_Model_ErrorTest extends ControllerTestCase {
+
+    public function testMapCode() {
+        $code = Oai_Model_Error::mapCode('1010');
+
+        $this->assertEquals('badVerb', $code);
+    }
+
+    /**
+     * @expectedException Oai_Model_Exception
+     * @expectedExceptionMessage Unknown oai error code 1
+     */
+    public function testMapCodeUnknown() {
+        Oai_Model_Error::mapCode(1);
+    }
+
+}

From cd5e3ce7110394e99ce26cbeb09bdc0f4ebc669b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 26 Aug 2016 15:49:12 +0200
Subject: [PATCH 041/115] OPUSVIER-2357 - Moved code for generating list of oai
 sets to model class.

---
 modules/oai/controllers/IndexController.php |  62 +--------
 modules/oai/models/SetSpec.php              |   1 -
 modules/oai/models/Sets.php                 | 134 ++++++++++++++++++++
 3 files changed, 138 insertions(+), 59 deletions(-)
 create mode 100644 modules/oai/models/Sets.php

diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php
index de9186eb7..b47cdd71f 100644
--- a/modules/oai/controllers/IndexController.php
+++ b/modules/oai/controllers/IndexController.php
@@ -323,70 +323,16 @@ private function __handleListRecords(array &$oaiRequest) {
      * @return void
      */
     private function __handleListSets() {
+        $logger = $this->getLogger();
+
         $repIdentifier = $this->_configuration->getRepositoryIdentifier();
 
         $this->_proc->setParameter('', 'repIdentifier', $repIdentifier);
         $this->_xml->appendChild($this->_xml->createElement('Documents'));
 
-        $sets = array(
-            'bibliography:true'  => 'Set for bibliographic entries',
-            'bibliography:false' => 'Set for non-bibliographic entries',
-        );
-
-        $logger = $this->getLogger();
-        $setSpecPattern = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
-
-        $finder = new Opus_DocumentFinder();
-        $finder->setServerState('published');
-        foreach ($finder->groupedTypesPlusCount() AS $doctype => $row) {
-            if (0 == preg_match("/^$setSpecPattern$/", $doctype)) {
-                $msg = "Invalid SetSpec (doctype='".$doctype."')."
-                        . " Allowed characters are [$setSpecPattern].";
-                $logger->err("OAI-PMH: $msg");
-                continue;
-            }
-
-            $setSpec = 'doc-type:' . $doctype;
-            // $count = $row['count'];
-            $sets[$setSpec] = "Set for document type '$doctype'";
-        }
+        $oaiSets = new Oai_Model_Sets();
 
-        $oaiRolesSets = Opus_CollectionRole::fetchAllOaiEnabledRoles();
-        foreach ($oaiRolesSets AS $result) {
-            if ($result['oai_name'] == 'doc-type') {
-                continue;
-            }
-
-            if (0 == preg_match("/^$setSpecPattern$/", $result['oai_name'])) {
-                $msg = "Invalid SetSpec (oai_name='".$result['oai_name']."'). "
-                       . " Please check collection role " . $result['id'] . ". "
-                        . " Allowed characters are $setSpecPattern.";
-                $logger->err("OAI-PMH: $msg");
-                continue;
-            }
-
-            $setSpec = $result['oai_name'];
-            // $count = $result['count'];
-            $sets[$setSpec] = "Set for collection '" . $result['oai_name'] . "'";
-
-            $role = new Opus_CollectionRole($result['id']);
-            foreach ($role->getOaiSetNames() AS $subset) {
-                $subSetSpec  = "$setSpec:" . $subset['oai_subset'];
-                // $subSetCount = $subset['count'];
-
-                if (0 == preg_match("/^$setSpecPattern$/", $subset['oai_subset'])) {
-                    $msg = "Invalid SetSpec (oai_name='".$subset['oai_subset']."')."
-                       . " Please check collection " . $subset['id'] . ". "
-                            . " Allowed characters are [$setSpecPattern].";
-                    $logger->err("OAI-PMH: $msg");
-                    continue;
-                }
-
-                $sets[$subSetSpec] = "Subset '" . $subset['oai_subset'] . "'"
-                        . " for collection '" . $result['oai_name'] . "'"
-                        . ': "' . trim($subset['name']) . '"';
-            }
-        }
+        $sets = $oaiSets->getSets();
 
         foreach ($sets as $type => $name) {
             $opusDoc = $this->_xml->createElement('Opus_Sets');
diff --git a/modules/oai/models/SetSpec.php b/modules/oai/models/SetSpec.php
index bae7ff7bd..3c58eb113 100644
--- a/modules/oai/models/SetSpec.php
+++ b/modules/oai/models/SetSpec.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * This file is part of OPUS. The software OPUS has been originally developed
  * at the University of Stuttgart with funding from the German Research Net,
diff --git a/modules/oai/models/Sets.php b/modules/oai/models/Sets.php
new file mode 100644
index 000000000..3f539b53e
--- /dev/null
+++ b/modules/oai/models/Sets.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Module_Oai
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2011-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Oai_Model_Sets extends Application_Model_Abstract {
+
+    /**
+     * Returns all oai sets.
+     * @return array
+     */
+    public function getSets() {
+        $sets = array(
+            'bibliography:true'  => 'Set for bibliographic entries',
+            'bibliography:false' => 'Set for non-bibliographic entries',
+        );
+
+        $sets = array_merge(
+            $sets,
+            $this->getSetsForDocumentTypes(),
+            $this->getSetsForCollections()
+        );
+
+        return $sets;
+    }
+
+    /**
+     * Returns oai sets for document types.
+     * @return array
+     */
+    public function getSetsForDocumentTypes() {
+        $logger = $this->getLogger();
+        $setSpecPattern = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
+
+        $sets = array();
+
+        $finder = new Opus_DocumentFinder();
+        $finder->setServerState('published');
+        foreach ($finder->groupedTypesPlusCount() AS $doctype => $row) {
+            if (0 == preg_match("/^$setSpecPattern$/", $doctype)) {
+                $msg = "Invalid SetSpec (doctype='".$doctype."')."
+                    . " Allowed characters are [$setSpecPattern].";
+                $logger->err("OAI-PMH: $msg");
+                continue;
+            }
+
+            $setSpec = 'doc-type:' . $doctype;
+            // $count = $row['count'];
+            $sets[$setSpec] = "Set for document type '$doctype'";
+        }
+
+        return $sets;
+    }
+
+    /**
+     * Returns oai sets for collections.
+     * @return array
+     */
+    public function getSetsForCollections() {
+        $sets = array();
+
+        $logger = $this->getLogger();
+
+        $setSpecPattern = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
+
+        $oaiRolesSets = Opus_CollectionRole::fetchAllOaiEnabledRoles();
+        foreach ($oaiRolesSets AS $result) {
+            if ($result['oai_name'] == 'doc-type') {
+                continue;
+            }
+
+            if (0 == preg_match("/^$setSpecPattern$/", $result['oai_name'])) {
+                $msg = "Invalid SetSpec (oai_name='".$result['oai_name']."'). "
+                    . " Please check collection role " . $result['id'] . ". "
+                    . " Allowed characters are $setSpecPattern.";
+                $logger->err("OAI-PMH: $msg");
+                continue;
+            }
+
+            $setSpec = $result['oai_name'];
+            // $count = $result['count'];
+            $sets[$setSpec] = "Set for collection '" . $result['oai_name'] . "'";
+
+            $role = new Opus_CollectionRole($result['id']);
+            foreach ($role->getOaiSetNames() AS $subset) {
+                $subSetSpec  = "$setSpec:" . $subset['oai_subset'];
+                // $subSetCount = $subset['count'];
+
+                if (0 == preg_match("/^$setSpecPattern$/", $subset['oai_subset'])) {
+                    $msg = "Invalid SetSpec (oai_name='".$subset['oai_subset']."')."
+                        . " Please check collection " . $subset['id'] . ". "
+                        . " Allowed characters are [$setSpecPattern].";
+                    $logger->err("OAI-PMH: $msg");
+                    continue;
+                }
+
+                $sets[$subSetSpec] = "Subset '" . $subset['oai_subset'] . "'"
+                    . " for collection '" . $result['oai_name'] . "'"
+                    . ': "' . trim($subset['name']) . '"';
+            }
+        }
+
+        return $sets;
+    }
+
+}

From 2e3803984ad36d2e96f15bbb3bc0440b194d27f5 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 26 Aug 2016 16:00:46 +0200
Subject: [PATCH 042/115] OPUSVIER-2357 - Separated sets for collection.
 Cleanup.

---
 modules/oai/models/Sets.php | 57 +++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/modules/oai/models/Sets.php b/modules/oai/models/Sets.php
index 3f539b53e..76c9d1cc0 100644
--- a/modules/oai/models/Sets.php
+++ b/modules/oai/models/Sets.php
@@ -33,6 +33,8 @@
 
 class Oai_Model_Sets extends Application_Model_Abstract {
 
+    const SET_SPEC_PATTERN = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
+
     /**
      * Returns all oai sets.
      * @return array
@@ -58,7 +60,7 @@ public function getSets() {
      */
     public function getSetsForDocumentTypes() {
         $logger = $this->getLogger();
-        $setSpecPattern = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
+        $setSpecPattern = self::SET_SPEC_PATTERN;
 
         $sets = array();
 
@@ -89,9 +91,10 @@ public function getSetsForCollections() {
 
         $logger = $this->getLogger();
 
-        $setSpecPattern = '[A-Za-z0-9\-_\.!~\*\'\(\)]+';
+        $setSpecPattern = self::SET_SPEC_PATTERN;
 
         $oaiRolesSets = Opus_CollectionRole::fetchAllOaiEnabledRoles();
+
         foreach ($oaiRolesSets AS $result) {
             if ($result['oai_name'] == 'doc-type') {
                 continue;
@@ -109,23 +112,41 @@ public function getSetsForCollections() {
             // $count = $result['count'];
             $sets[$setSpec] = "Set for collection '" . $result['oai_name'] . "'";
 
-            $role = new Opus_CollectionRole($result['id']);
-            foreach ($role->getOaiSetNames() AS $subset) {
-                $subSetSpec  = "$setSpec:" . $subset['oai_subset'];
-                // $subSetCount = $subset['count'];
-
-                if (0 == preg_match("/^$setSpecPattern$/", $subset['oai_subset'])) {
-                    $msg = "Invalid SetSpec (oai_name='".$subset['oai_subset']."')."
-                        . " Please check collection " . $subset['id'] . ". "
-                        . " Allowed characters are [$setSpecPattern].";
-                    $logger->err("OAI-PMH: $msg");
-                    continue;
-                }
-
-                $sets[$subSetSpec] = "Subset '" . $subset['oai_subset'] . "'"
-                    . " for collection '" . $result['oai_name'] . "'"
-                    . ': "' . trim($subset['name']) . '"';
+            $sets = array_merge($sets, $this->getSetsForCollectionRole($setSpec, $result['id']));
+        }
+
+        return $sets;
+    }
+
+    /**
+     * Returns sets for collections of a collection role.
+     * @param $setSpec OAI name for collection role
+     * @param $roleId Database ID of role
+     * @return array
+     */
+    public function getSetsForCollectionRole($setSpec, $roleId) {
+        $logger = $this->getLogger();
+
+        $sets = array();
+
+        $setSpecPattern = self::SET_SPEC_PATTERN;
+
+        $role = new Opus_CollectionRole($roleId);
+        foreach ($role->getOaiSetNames() AS $subset) {
+            $subSetSpec  = "$setSpec:" . $subset['oai_subset'];
+            // $subSetCount = $subset['count'];
+
+            if (0 == preg_match("/^$setSpecPattern$/", $subset['oai_subset'])) {
+                $msg = "Invalid SetSpec (oai_name='".$subset['oai_subset']."')."
+                    . " Please check collection " . $subset['id'] . ". "
+                    . " Allowed characters are [$setSpecPattern].";
+                $logger->err("OAI-PMH: $msg");
+                continue;
             }
+
+            $sets[$subSetSpec] = "Subset '" . $subset['oai_subset'] . "'"
+                . " for collection '" . $setSpec . "'"
+                . ': "' . trim($subset['name']) . '"';
         }
 
         return $sets;

From d3cd4c4609a33e52b0ea6826643c1b6ed714e33f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 13 Sep 2016 15:44:13 +0200
Subject: [PATCH 043/115] OPUSVIER-3640 - Fixed paths to files in meta tags.

---
 .../frontdoor/controllers/IndexController.php | 44 +++++++++++++------
 .../controllers/IndexControllerTest.php       | 27 ++++++++++++
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/modules/frontdoor/controllers/IndexController.php b/modules/frontdoor/controllers/IndexController.php
index fbc1d6749..46cbf9f65 100644
--- a/modules/frontdoor/controllers/IndexController.php
+++ b/modules/frontdoor/controllers/IndexController.php
@@ -33,6 +33,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  * @version     $Id$
  *
+ * TODO move XSLT functions into model class
  */
 class Frontdoor_IndexController extends Application_Controller_Action {
 
@@ -242,6 +243,8 @@ public static function checkIfUserHasFileAccess($fileId = null) {
      *
      * @param Opus_Date $now
      * @return bool true - if embargo date has passed; false - if not
+     *
+     * TODO another document instantiation (find more efficient way)
      */
     public static function checkIfFileEmbargoHasPassed($docId) {
         $doc = new Opus_Document($docId);
@@ -309,11 +312,15 @@ private function addMetaTagsForDocument($document) {
         }
     }
 
+    /**
+     * @param $document
+     * @return array
+     * TODO separate different tags into function/plugins ???
+     */
     private function createMetaTagsForDocument($document) {
         $config = $this->getConfig();
-        $serverUrl = $this->view->serverUrl();
-        $baseUrlFiles = $serverUrl
-                . (isset($config, $config->deliver->url->prefix) ? $config->deliver->url->prefix : '/documents');
+        $baseUrlFiles = $this->view->fullUrl()
+                . (isset($config, $config->deliver->url->prefix) ? $config->deliver->url->prefix : '/files');
 
         $metas = array();
 
@@ -375,18 +382,29 @@ private function createMetaTagsForDocument($document) {
             $metas[] = array('DC.Identifier', $identifierValue);
             $metas[] = array('DC.Identifier', $config->urn->resolverUrl . $identifierValue);
         }
-        $metas[] = array('DC.Identifier', $this->view->fullUrl() . '/frontdoor/index/index/docId/' . $document->getId());
+        $metas[] = array(
+            'DC.Identifier', $this->view->fullUrl() . '/frontdoor/index/index/docId/' . $document->getId()
+        );
 
-        foreach ($document->getFile() AS $file) {
-            if (!$file->exists() or ( $file->getVisibleInFrontdoor() !== '1')) {
-                continue;
-            }
-            $metas[] = array('DC.Identifier', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName());
+        if (self::checkIfFileEmbargoHasPassed($document->getId())) {
+            foreach ($document->getFile() AS $file) {
+                if (!$file->exists()
+                        or ($file->getVisibleInFrontdoor() !== '1')
+                        or !self::checkIfUserHasFileAccess($file->getId())) {
+                    continue;
+                }
+                $metas[] = array('DC.Identifier', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName());
 
-            if ($file->getMimeType() == 'application/pdf') {
-                $metas[] = array('citation_pdf_url', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName());
-            } else if ($file->getMimeType() == 'application/postscript') {
-                $metas[] = array('citation_ps_url', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName());
+                if ($file->getMimeType() == 'application/pdf') {
+                    $metas[] = array(
+                        'citation_pdf_url', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName()
+                    );
+                }
+                else if ($file->getMimeType() == 'application/postscript') {
+                    $metas[] = array(
+                        'citation_ps_url', "$baseUrlFiles/" . $document->getId() . "/" . $file->getPathName()
+                    );
+                }
             }
         }
 
diff --git a/tests/modules/frontdoor/controllers/IndexControllerTest.php b/tests/modules/frontdoor/controllers/IndexControllerTest.php
index c1a91b66f..6d811fc36 100644
--- a/tests/modules/frontdoor/controllers/IndexControllerTest.php
+++ b/tests/modules/frontdoor/controllers/IndexControllerTest.php
@@ -1079,6 +1079,33 @@ public function testEmbargoDateLabelWithEmbargoDatePassed() {
         $this->assertQueryContentContains('//td', '2012/02/01');
     }
 
+    public function testMetaTagsForFiles() {
+        $file = $this->createTestFile('foo.pdf');
+
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+        $doc->addFile($file);
+        $docId = $doc->store();
+
+        $this->dispatch('frontdoor/index/index/docId/' . $docId);
+
+        $this->assertQueryContentContains('//meta/@content', "/files/$docId/foo.pdf");
+    }
+
+    public function testMetaTagsforEmbargoedDocument() {
+        $file = $this->createTestFile('foo.pdf');
+
+        $doc = $this->createTestDocument();
+        $doc->setEmbargoDate('2112-02-01');
+        $doc->setServerState('published');
+        $doc->addFile($file);
+        $docId = $doc->store();
+
+        $this->dispatch('frontdoor/index/index/docId/' . $docId);
+
+        $this->assertNotQueryContentContains('//meta/@content', "/files/$docId/foo.pdf");
+    }
+
     /**
      * EmbargoDate should be shown in metadata table, no matter if it has passed or not.
      * OPUSVIER-3270.

From 467379c8c3fcaad602785bf0ab014338f9b7757d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 14 Sep 2016 16:34:48 +0200
Subject: [PATCH 044/115] OPUSVIER-3640 - Added reminder for more tests.

---
 tests/modules/frontdoor/controllers/IndexControllerTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/modules/frontdoor/controllers/IndexControllerTest.php b/tests/modules/frontdoor/controllers/IndexControllerTest.php
index 6d811fc36..147561663 100644
--- a/tests/modules/frontdoor/controllers/IndexControllerTest.php
+++ b/tests/modules/frontdoor/controllers/IndexControllerTest.php
@@ -1079,6 +1079,10 @@ public function testEmbargoDateLabelWithEmbargoDatePassed() {
         $this->assertQueryContentContains('//td', '2012/02/01');
     }
 
+    public function testMetaTagsForFileAccess() {
+        $this->markTestIncomplete('test not implemented');
+    }
+
     public function testMetaTagsForFiles() {
         $file = $this->createTestFile('foo.pdf');
 

From d75c6ff65acb3731f478a5a57ef91fd01de6d7d5 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 15 Sep 2016 15:21:25 +0200
Subject: [PATCH 045/115] OPUSVIER-3641 - Fixed sorting of files in frontdoor.
 Simple unit test.

---
 .../frontdoor/views/scripts/index/index.xslt  |  2 +-
 .../controllers/IndexControllerTest.php       | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 80cbbd535..5f88bd6e1 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -107,7 +107,7 @@
                            <xsl:choose>
                                <xsl:when test="php:functionString('Frontdoor_IndexController::useCustomSortOrder', @Id)">
                                   <xsl:apply-templates select="File[@VisibleInFrontdoor='1']">
-                                     <xsl:sort select="@SortOrder"/>
+                                     <xsl:sort select="@SortOrder" data-type="number" />
                                   </xsl:apply-templates>
                                </xsl:when>
                                <xsl:otherwise>
diff --git a/tests/modules/frontdoor/controllers/IndexControllerTest.php b/tests/modules/frontdoor/controllers/IndexControllerTest.php
index 147561663..a829b9deb 100644
--- a/tests/modules/frontdoor/controllers/IndexControllerTest.php
+++ b/tests/modules/frontdoor/controllers/IndexControllerTest.php
@@ -944,6 +944,32 @@ public function testTitleSortOrderEnglishFirst() {
         }
     }
 
+    public function testSortingOfFiles() {
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+
+        $file = $this->createTestFile('file1.txt');
+        $file->setSortOrder(1);
+        $doc->addFile($file);
+
+        $file = $this->createTestFile('file2.txt');
+        $file->setSortOrder(2);
+        $doc->addFile($file);
+
+        $file = $this->createTestFile('file10.txt');
+        $file->setSortOrder(10);
+        $doc->addFile($file);
+
+        $docId = $doc->store();
+
+        $this->dispatch("/frontdoor/index/index/docId/$docId");
+
+        $body = $this->getResponse()->getBody();
+
+        $this->assertTrue(strpos($body, '>file1.txt') < strpos($body, '>file2.txt'), "Order of files is wrong.");
+        $this->assertTrue(strpos($body, '>file2.txt') < strpos($body, '>file10.txt'), "Order of files is wrong.");
+    }
+
     /**
      * Tests, whether the current language of a document's file is shown behind the link as flag.
      */

From e310529caaa49f410e0e829032c4ea907d6670d4 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 21 Sep 2016 11:38:06 +0200
Subject: [PATCH 046/115] OPUSVIER-2358 - Treat empty subsets like empty sets.

---
 modules/oai/models/DocumentList.php           | 15 +++++++++++++--
 .../oai/controllers/IndexControllerTest.php   | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/modules/oai/models/DocumentList.php b/modules/oai/models/DocumentList.php
index e2c3e230b..796a99b95 100644
--- a/modules/oai/models/DocumentList.php
+++ b/modules/oai/models/DocumentList.php
@@ -59,6 +59,8 @@ class Oai_Model_DocumentList {
      *
      * @param array &$oaiRequest
      * @return array
+     *
+     * TODO function contains metadataPrefix specifische criteria for generating document list (refactor!)
      */
     public function query(array $oaiRequest) {
         $finder = new Opus_DocumentFinder();
@@ -132,8 +134,17 @@ public function query(array $oaiRequest) {
                     );
 
                     if (count($foundSubsets) < 1) {
-                        $msg = "Invalid SetSpec: Subset does not exist.";
-                        throw new Oai_Model_Exception($msg);
+                        $emptySubsets = array_filter($role->getAllOaiSetNames(), function ($s) use ($subsetName) {
+                            return $s['oai_subset'] === $subsetName;
+                        });
+
+                        if (count($emptySubsets) === 1) {
+                            return array();
+                        }
+                        else {
+                            $msg = "Invalid SetSpec: Subset does not exist.";
+                            throw new Oai_Model_Exception($msg);
+                        }
                     }
 
                     foreach ($foundSubsets AS $subset) {
diff --git a/tests/modules/oai/controllers/IndexControllerTest.php b/tests/modules/oai/controllers/IndexControllerTest.php
index 468faeedd..502d942fd 100644
--- a/tests/modules/oai/controllers/IndexControllerTest.php
+++ b/tests/modules/oai/controllers/IndexControllerTest.php
@@ -1313,6 +1313,25 @@ public function testForInvalidSetSpecsInGetRecord79() {
         $this->assertNotContains('<setSpec>pacs:07.75.', $body);
         $this->assertNotContains('<setSpec>pacs:85.85.', $body);
     }
+
+    public function testListRecordsForEmptySet() {
+        $this->dispatch('/oai?verb=ListRecords&metadataPrefix=oai_dc&set=open_access');
+
+        $this->assertResponseCode(200);
+
+        $body = $this->getResponse()->getBody();
+
+        $this->assertContains('<error code="noRecordsMatch">', $body);
+    }
+
+    public function testListRecordsForEmptySubset() {
+        $this->dispatch('/oai?verb=ListRecords&metadataPrefix=oai_dc&set=open_access:open_access');
+
+        $this->assertResponseCode(200);
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('<error code="noRecordsMatch">', $body);
+    }
+
     /**
      * Regression test for OPUSVIER-2607
      */

From f1f826d0c37cbebbf409b3c208051dae2ac35ee0 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 22 Sep 2016 17:39:39 +0200
Subject: [PATCH 047/115] OPUSVIER-1473 - Added todo for later.

---
 bin/set-file-permissions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/set-file-permissions.sh b/bin/set-file-permissions.sh
index b6294ce65..259707223 100755
--- a/bin/set-file-permissions.sh
+++ b/bin/set-file-permissions.sh
@@ -26,6 +26,7 @@
 # TODO query user for setting permissions on other folders (language_custom, config files)?
 # TODO add special handling for access to config.ini (more restricted?)
 # TODO add special handling for access to resources that can be edited in setup pages
+# TODO restrict access to folders/files for web server (bin,scripts,tests,db)
 #
 
 set -e

From 31467b92a45353eec47337ce858089f9c44d1b63 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 23 Sep 2016 12:01:00 +0200
Subject: [PATCH 048/115] OPUSVIER-1617 - Added todo for later.

---
 bin/install-apache.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/install-apache.sh b/bin/install-apache.sh
index 3dfcb73ff..c4594625c 100755
--- a/bin/install-apache.sh
+++ b/bin/install-apache.sh
@@ -28,6 +28,7 @@
 #
 # TODO protection against using an existing site?
 # TODO handle updating/creating configuration of site already available in Apache2
+# TODO add sudo check before running apache2 commands
 #
 
 set -e

From 45b0c67ce595cb17259cdbfc9831e631ddcb28f1 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 7 Oct 2016 14:50:33 +0200
Subject: [PATCH 049/115] Added unit test.

---
 tests/modules/admin/forms/CollectionTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/modules/admin/forms/CollectionTest.php b/tests/modules/admin/forms/CollectionTest.php
index a96b502b8..88ca6cad9 100644
--- a/tests/modules/admin/forms/CollectionTest.php
+++ b/tests/modules/admin/forms/CollectionTest.php
@@ -73,6 +73,22 @@ public function testPopulateFromModel() {
         $this->assertEquals('plain', $form->getElement('Theme')->getValue());
     }
 
+    public function testHandlingOfNullValue() {
+        $form = new Admin_Form_Collection();
+
+        $model = new Opus_Collection();
+
+        $model->setName('TestName');
+        $model->setNumber(null);
+        $model->setOaiSubset(null);
+
+        $form->populateFromModel($model);
+
+        $this->assertEquals('TestName', $form->getElement('Name')->getValue());
+        $this->assertNull($form->getElement('Number')->getValue());
+        $this->assertNull($form->getElement('OaiSubset')->getValue());
+    }
+
     public function testPopulateFromModelWithId() {
         $form = new Admin_Form_Collection();
 

From 1f263a887aaa4715ddf6fa547128251e861c620b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 13 Oct 2016 16:22:30 +0200
Subject: [PATCH 050/115] OPUSVIER-3646 - Left/Right key navigation of search
 result for frontdoor.

---
 .../views/scripts/index/pagination.phtml      |  4 ++--
 public/layouts/opus4/js/frontdoorutil.js      | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/frontdoor/views/scripts/index/pagination.phtml b/modules/frontdoor/views/scripts/index/pagination.phtml
index 6af7aabcd..ad2e994dc 100644
--- a/modules/frontdoor/views/scripts/index/pagination.phtml
+++ b/modules/frontdoor/views/scripts/index/pagination.phtml
@@ -55,7 +55,7 @@
                 <?php if ($this->searchPosition == $this->firstEntry) : ?>
                     <div title="<?= $this->translate('pagination_previous_entry') ?>"></div>
                 <?php else: ?>
-                    <a title="<?= $this->translate('pagination_previous_entry') ?>" href="<?= $this->url(array('start' => $this->previousEntry, 'nav' => 'prev', 'docId' => null)); ?>"></a>
+                    <a id="frontdoor-link-prev" title="<?= $this->translate('pagination_previous_entry') ?>" href="<?= $this->url(array('start' => $this->previousEntry, 'nav' => 'prev', 'docId' => null)); ?>"></a>
                 <?php endif ?>
             </li>
 
@@ -63,7 +63,7 @@
                 <?php if ($this->searchPosition == $this->lastEntry) : ?>
                     <div title="<?= $this->translate('pagination_next_entry') ?>"></div>
                 <?php else: ?>
-                    <a title="<?= $this->translate('pagination_next_entry') ?>" href="<?= $this->url(array('start' => $this->nextEntry, 'nav' => 'next', 'docId' => null)); ?>"></a>
+                    <a id="frontdoor-link-next" title="<?= $this->translate('pagination_next_entry') ?>" href="<?= $this->url(array('start' => $this->nextEntry, 'nav' => 'next', 'docId' => null)); ?>"></a>
                 <?php endif ?>
             </li>
         </ul>
diff --git a/public/layouts/opus4/js/frontdoorutil.js b/public/layouts/opus4/js/frontdoorutil.js
index e442c17f6..689af0a76 100644
--- a/public/layouts/opus4/js/frontdoorutil.js
+++ b/public/layouts/opus4/js/frontdoorutil.js
@@ -25,10 +25,9 @@
  *
  * @category    Application
  * @author      Sascha Szott <szott@zib.de>
- * @copyright   Copyright (c) 2008-2012, OPUS 4 development team
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
- * 
  */
 
 $(function() {
@@ -50,5 +49,23 @@ $(function() {
     $('.abstractButton').click(toggleAbstract);
     $('.abstractThreeDots').click(toggleAbstract);
 
+    // add key handler for navigation
+    $('body').on('keydown', function (e) {
+            var event = window.event ? window.event : e;
 
+            if (event.keyCode == 37) {
+                var link = $('#frontdoor-link-prev');
+                if (link.length) {
+                    link[0].click();
+                }
+            }
+            else if (event.keyCode == 39) {
+                var link = $('#frontdoor-link-next');
+                if (link.length) {
+                    link[0].click();
+                }
+            }
+        }
+    );
 });
+

From 83990326f74514df9bf84873066a2abe6dd667ac Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 18 Oct 2016 13:40:03 +0200
Subject: [PATCH 051/115] OPUSVIER-3612 - Cron script for updating documents
 with expired embargoes.

---
 scripts/cron/cron-embargo-update.php          | 62 ++++++++++++++
 tests/scripts/cron/EmbargoUpdateTest.php      | 85 +++++++++++++++++++
 .../scripts/cron/UpdateDocumentCacheTest.php  |  4 +-
 3 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 scripts/cron/cron-embargo-update.php
 create mode 100644 tests/scripts/cron/EmbargoUpdateTest.php

diff --git a/scripts/cron/cron-embargo-update.php b/scripts/cron/cron-embargo-update.php
new file mode 100644
index 000000000..741acf94a
--- /dev/null
+++ b/scripts/cron/cron-embargo-update.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the North Rhine-Westphalian Library Service Center,
+ * the Cooperative Library Network Berlin-Brandenburg, the Saarland University
+ * and State Library, the Saxon State Library - Dresden State and University
+ * Library, the Bielefeld University Library and the University Library of
+ * Hamburg University of Technology with funding from the German Research
+ * Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2011-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+require_once dirname(__FILE__) . '/../common/bootstrap.php';
+
+/*
+ * This cron job must be used if embargo dates are used in repository.
+ *
+ * This script finds documents with expired embargo date that have to been
+ * updated after the expiration (ServerDateModified < EmbargoDate) and sets
+ * ServerDateModified to the current time.
+ *
+ * The expiration of an embargo date does not change the document. Until the
+ * date is expired access to the files of the document is blocked. After the
+ * expiration access to the files is possible. However the document will not
+ * be harvested again automatically. In order for the document to be included
+ * in the next harvesting ServerDateModified needs to be updated.
+ */
+
+$docfinder = new Opus_DocumentFinder();
+
+$now = new Opus_Date();
+$now->setNow();
+
+// Find documents with expired EmbargoDate and ServerDateModified < EmbargoDate
+$docfinder->setEmbargoDateBeforeNotModifiedAfter($now);
+
+$foundIds = $docfinder->ids();
+
+// Update ServerDateModified for all found documents
+Opus_Document::setServerDateModifiedByIds($now, $foundIds);
diff --git a/tests/scripts/cron/EmbargoUpdateTest.php b/tests/scripts/cron/EmbargoUpdateTest.php
new file mode 100644
index 000000000..c55963183
--- /dev/null
+++ b/tests/scripts/cron/EmbargoUpdateTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Cronjob
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+require_once('CronTestCase.php');
+
+/**
+ *
+ */
+class EmbargoUpdateTest extends CronTestCase
+{
+
+    public function testEmbargoUpdate()
+    {
+        $yesterday = new Opus_Date();
+        $yesterday->setDateTime(new DateTime(date('Y-m-d H:i:s', strtotime('-1 day'))));
+
+        $today = date('Y-m-d', time());
+        $tomorrow = date('Y-m-d', time() + (60 * 60 * 24));
+
+        $doc = new Opus_Document();
+        $doc->setEmbargoDate($today);
+        $expiredId = $doc->store();
+
+        $doc = new Opus_Document();
+        $noEmbargoId = $doc->store();
+
+        $doc = new Opus_Document();
+        $doc->setEmbargoDate($tomorrow);
+        $notExpiredId = $doc->store();
+
+        Opus_Document::setServerDateModifiedByIds($yesterday, array($expiredId, $noEmbargoId, $notExpiredId));
+
+        $this->executeScript('cron-embargo-update.php');
+
+        $doc = new Opus_Document($expiredId);
+        $this->assertTrue($this->sameDay(new DateTime($today), $doc->getServerDateModified()->getDateTime()));
+
+        $doc = new Opus_Document($notExpiredId);
+        $this->assertTrue($this->sameDay($yesterday->getDateTime(), $doc->getServerDateModified()->getDateTime()));
+
+        $doc = new Opus_Document($noEmbargoId);
+        $this->assertTrue($this->sameDay($yesterday->getDateTime(), $doc->getServerDateModified()->getDateTime()));
+    }
+
+    private function sameDay($firstDate, $secondDate)
+    {
+        $first = $firstDate->format('Y-m-d');
+        $second = $secondDate->format('Y-m-d');
+        return $first == $second;
+    }
+
+}
+
+
diff --git a/tests/scripts/cron/UpdateDocumentCacheTest.php b/tests/scripts/cron/UpdateDocumentCacheTest.php
index f8d2d3c44..32c6122fe 100644
--- a/tests/scripts/cron/UpdateDocumentCacheTest.php
+++ b/tests/scripts/cron/UpdateDocumentCacheTest.php
@@ -28,10 +28,10 @@
  * @category    Cronjob
  * @package     Tests
  * @author      Edouard Simon (edouard.simon@zib.de)
- * @copyright   Copyright (c) 2008-2012, OPUS 4 development team
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
  */
+
 require_once('CronTestCase.php');
 
 /**

From 91add620506a4d0fc639d0eba065a870ea5bb6d5 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 21 Oct 2016 11:53:22 +0200
Subject: [PATCH 052/115] OPUSVIER-3508 - Unit test meaningless assert removed.

---
 tests/modules/oai/models/ContainerTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/modules/oai/models/ContainerTest.php b/tests/modules/oai/models/ContainerTest.php
index 401ceabf3..77adfa93f 100644
--- a/tests/modules/oai/models/ContainerTest.php
+++ b/tests/modules/oai/models/ContainerTest.php
@@ -420,9 +420,7 @@ public function testGetAccessibleFilesForEmbargoedDocument() {
         $this->assertFalse($doc->hasEmbargoPassed()); // not yet passed
 
         $container = new Oai_Model_Container($doc->getId());
-        $files = $container->getAccessibleFiles();
-
-        $this->assertCount(1, $files);
+        $container->getAccessibleFiles();
     }
 
 }

From 8a00fa9d373f8cf32fb9320527eedfe585e35ed9 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 21 Oct 2016 13:22:59 +0200
Subject: [PATCH 053/115] OPUSVIER-3508 - Minimal cleanup in SendFile helper.

---
 .../Controller/Action/Helper/SendFile.php     | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/library/Application/Controller/Action/Helper/SendFile.php b/library/Application/Controller/Action/Helper/SendFile.php
index 1f11c2290..1e8c4b45b 100644
--- a/library/Application/Controller/Action/Helper/SendFile.php
+++ b/library/Application/Controller/Action/Helper/SendFile.php
@@ -25,31 +25,26 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @category    TODO
+ * @category    Applicaton
  * @author      Thoralf Klein <thoralf.klein@zib.de>
- * @copyright   Copyright (c) 2011, OPUS 4 development team
+ * @copyright   Copyright (c) 2011-2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- * @version     $Id$
  */
 
-class Application_Controller_Action_Helper_SendFile extends Zend_Controller_Action_Helper_Abstract {
+class Application_Controller_Action_Helper_SendFile extends Application_Controller_Action_Helper_Abstract {
 
     const FPASSTHRU = 'fpassthru';
 
     const XSENDFILE = 'xsendfile';
 
-    /**
-     * @var Zend_Log
-     */
-    private $_logger = null;
-
     /**
      * This method to call when we use   $this->_helper->SendFile(...)   and
      * forwards to method Application_Controller_Action_Helper_SendFile::sendFile
      *
      * @see Application_Controller_Action_Helper_SendFile::sendFile
      */
-    public function direct($file, $method = self::FPASSTHRU, $mustResend = false) {
+    public function direct($file, $method = self::FPASSTHRU, $mustResend = false)
+    {
         return $this->sendFile($file, $method, $mustResend);
     }
 
@@ -61,8 +56,8 @@ public function direct($file, $method = self::FPASSTHRU, $mustResend = false) {
      * @param boolean $mustResend Ignore "if-modified-since" header, defaults to false.
      * @return void
      */
-    public function sendFile($file, $method = self::FPASSTHRU, $mustResend = false) {
-
+    public function sendFile($file, $method = self::FPASSTHRU, $mustResend = false)
+    {
         $response = $this->getResponse();
         if (!$response->canSendHeaders()) {
             throw new Exception("Cannot send headers");
@@ -109,7 +104,8 @@ public function notModifiedSince($modified) {
      *
      * @param string $file
      */
-    private function sendFileViaXSendfile($file) {
+    private function sendFileViaXSendfile($file)
+    {
         $response = $this->getResponse();
         $response->setHttpResponseCode(200);
         $response->setHeader('X-Sendfile', $file);
@@ -123,14 +119,17 @@ private function sendFileViaXSendfile($file) {
      *
      * @SuppressWarnings(PHPMD.ExitExpression)
      */
-    private function sendFileViaFpassthru($file) {
+    private function sendFileViaFpassthru($file)
+    {
         $response = $this->getResponse();
         $response->setHttpResponseCode(200);
 
-        if (!is_null($this->_logger)) {
+        $logger = $this->getLogger();
+
+        if (!is_null($logger)) {
             $content = ob_get_contents();
-            if (!empty ($content)) {
-                $this->_logger->err($content);
+            if (!empty($content)) {
+                $logger->err($content);
             }
         }
 
@@ -153,15 +152,8 @@ private function sendFileViaFpassthru($file) {
         }
 
         fclose($filePointer);
-        exit; // needed for preventing broken downloads (OPUSVIER-1806)
-    }
 
-    /**
-     *
-     * @param Zend_Log $logger
-     */
-    public function setLogger($logger) {
-        $this->_logger = $logger;
+        exit; // needed for preventing broken downloads (OPUSVIER-1806)
     }
 
 }

From 9f064706b524343048050a0b50f1fb3edefb675c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 26 Oct 2016 15:53:56 +0200
Subject: [PATCH 054/115] OPUSVIER-3647 - .gitignore files in tests/workspace
 removed. Modified Bootstrap to ensure directories.

---
 tests/Bootstrap.php                       | 16 ++++++++++++++++
 tests/workspace/cache/.gitignore          |  2 --
 tests/workspace/export/.gitignore         |  2 --
 tests/workspace/files/.gitignore          |  2 --
 tests/workspace/incoming/.gitignore       |  2 --
 tests/workspace/log/.gitignore            |  2 --
 tests/workspace/tmp/.gitignore            |  3 ---
 tests/workspace/tmp/resumption/.gitignore |  2 --
 8 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 tests/workspace/cache/.gitignore
 delete mode 100644 tests/workspace/export/.gitignore
 delete mode 100644 tests/workspace/files/.gitignore
 delete mode 100644 tests/workspace/incoming/.gitignore
 delete mode 100644 tests/workspace/log/.gitignore
 delete mode 100644 tests/workspace/tmp/.gitignore
 delete mode 100644 tests/workspace/tmp/resumption/.gitignore

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 97f491e3b..814d562ed 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -58,3 +58,19 @@
 $autoloader = Zend_Loader_Autoloader::getInstance();
 $autoloader->suppressNotFoundWarnings(false);
 $autoloader->setFallbackAutoloader(true);
+
+// make sure necessary directories are available
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/tmp');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/tmp/resumption');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/incoming');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/log');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/files');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/cache');
+ensureDirectory(APPLICATION_PATH . '/tests/workspace/export');
+
+function ensureDirectory($path) {
+    if (!is_dir($path)) {
+        mkdir($path);
+        echo "Created directory '$path'" . PHP_EOL;
+    }
+}
diff --git a/tests/workspace/cache/.gitignore b/tests/workspace/cache/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/workspace/export/.gitignore b/tests/workspace/export/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/export/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/workspace/files/.gitignore b/tests/workspace/files/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/workspace/incoming/.gitignore b/tests/workspace/incoming/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/incoming/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/workspace/log/.gitignore b/tests/workspace/log/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/workspace/tmp/.gitignore b/tests/workspace/tmp/.gitignore
deleted file mode 100644
index 1ec4cc463..000000000
--- a/tests/workspace/tmp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!resumption
diff --git a/tests/workspace/tmp/resumption/.gitignore b/tests/workspace/tmp/resumption/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/workspace/tmp/resumption/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

From 98de8834aa14be990629093d1de8ebc2bb94cdb8 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 26 Oct 2016 15:56:38 +0200
Subject: [PATCH 055/115] OPUSVIER-3647 - Made sure tests/workspace directory
 is available.

---
 tests/Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 814d562ed..c45cf049c 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -60,6 +60,7 @@
 $autoloader->setFallbackAutoloader(true);
 
 // make sure necessary directories are available
+ensureDirectory(APPLICATION_PATH . '/tests/workspace');
 ensureDirectory(APPLICATION_PATH . '/tests/workspace/tmp');
 ensureDirectory(APPLICATION_PATH . '/tests/workspace/tmp/resumption');
 ensureDirectory(APPLICATION_PATH . '/tests/workspace/incoming');

From f619c857fb6ef1bdc6cfea6242476fe42fc7473c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 26 Oct 2016 17:18:36 +0200
Subject: [PATCH 056/115] OPUSVIER-3647 - Remove .gitignore from workspace/log
 directory.

---
 bin/install.sh           | 1 +
 workspace/log/.gitignore | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 workspace/log/.gitignore

diff --git a/bin/install.sh b/bin/install.sh
index f74e215fb..86146a2bd 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -377,6 +377,7 @@ CONFIG_INI="$BASEDIR/application/configs/$OPUS_CONF"
 
 mkdir -p "$BASEDIR/workspace/files"
 mkdir -p "$BASEDIR/workspace/incoming"
+mkdir -p "$BASEDIR/workspace/log"
 
 #
 # Import some test documents optionally
diff --git a/workspace/log/.gitignore b/workspace/log/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/workspace/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

From fa2d70e7774fecdcb323a70f10b90758055ae6a1 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 26 Oct 2016 17:27:10 +0200
Subject: [PATCH 057/115] OPUSVIER-3647 - Removed remaining .gitignore files
 from workspace directories.

---
 bin/install.sh                      | 4 ++++
 workspace/cache/.gitignore          | 2 --
 workspace/export/.gitignore         | 2 --
 workspace/tmp/.gitignore            | 3 ---
 workspace/tmp/resumption/.gitignore | 2 --
 5 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 workspace/cache/.gitignore
 delete mode 100644 workspace/export/.gitignore
 delete mode 100644 workspace/tmp/.gitignore
 delete mode 100644 workspace/tmp/resumption/.gitignore

diff --git a/bin/install.sh b/bin/install.sh
index 86146a2bd..b136573ba 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -378,6 +378,10 @@ CONFIG_INI="$BASEDIR/application/configs/$OPUS_CONF"
 mkdir -p "$BASEDIR/workspace/files"
 mkdir -p "$BASEDIR/workspace/incoming"
 mkdir -p "$BASEDIR/workspace/log"
+mkdir -p "$BASEDIR/workspace/cache"
+mkdir -p "$BASEDIR/workspace/export"
+mkdir -p "$BASEDIR/workspace/tmp"
+mkdir -p "$BASEDIR/workspace/tmp/resumption"
 
 #
 # Import some test documents optionally
diff --git a/workspace/cache/.gitignore b/workspace/cache/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/workspace/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/workspace/export/.gitignore b/workspace/export/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/workspace/export/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/workspace/tmp/.gitignore b/workspace/tmp/.gitignore
deleted file mode 100644
index 1ec4cc463..000000000
--- a/workspace/tmp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!resumption
diff --git a/workspace/tmp/resumption/.gitignore b/workspace/tmp/resumption/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/workspace/tmp/resumption/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

From 64ca681711dd48ae3a708dbfc761cb14d0818d13 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 26 Oct 2016 17:33:24 +0200
Subject: [PATCH 058/115] OPUSVIER-3647 - Moved code for create workspace
 folders into separate script.

---
 bin/install.sh           |  8 +-------
 bin/prepare-workspace.sh | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100755 bin/prepare-workspace.sh

diff --git a/bin/install.sh b/bin/install.sh
index b136573ba..8ffafa77f 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -375,13 +375,7 @@ CONFIG_INI="$BASEDIR/application/configs/$OPUS_CONF"
 # Prepare workspace
 #
 
-mkdir -p "$BASEDIR/workspace/files"
-mkdir -p "$BASEDIR/workspace/incoming"
-mkdir -p "$BASEDIR/workspace/log"
-mkdir -p "$BASEDIR/workspace/cache"
-mkdir -p "$BASEDIR/workspace/export"
-mkdir -p "$BASEDIR/workspace/tmp"
-mkdir -p "$BASEDIR/workspace/tmp/resumption"
+"$SCRIPT_PATH/prepare-workspace.sh"
 
 #
 # Import some test documents optionally
diff --git a/bin/prepare-workspace.sh b/bin/prepare-workspace.sh
new file mode 100755
index 000000000..7c1e32325
--- /dev/null
+++ b/bin/prepare-workspace.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+#
+# LICENCE
+# This code is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This code is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# @author      Sascha Szott <szott@zib.de>
+# @author      Jens Schwidder <schwidder@zib.de>
+# @copyright   Copyright (c) 2010-2016, OPUS 4 development team
+# @license     http://www.gnu.org/licenses/gpl.html General Public License
+
+#
+# Creates folders for workspace.
+#
+# TODO add parameter for workspace location
+#
+
+set -e
+
+SCRIPT_NAME="`basename "$0"`"
+SCRIPT_NAME_FULL="`readlink -f "$0"`"
+SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
+
+BASEDIR="`dirname "$SCRIPT_PATH"`"
+
+mkdir -p "$BASEDIR/workspace/files"
+mkdir -p "$BASEDIR/workspace/incoming"
+mkdir -p "$BASEDIR/workspace/log"
+mkdir -p "$BASEDIR/workspace/cache"
+mkdir -p "$BASEDIR/workspace/export"
+mkdir -p "$BASEDIR/workspace/tmp"
+mkdir -p "$BASEDIR/workspace/tmp/resumption"
+

From 6f7d56208f139611a8c4a49a8585791e2c55ae0c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 27 Oct 2016 11:48:38 +0200
Subject: [PATCH 059/115] OPUSVIER-3068 - Add admin account to configuration.

---
 application/configs/config.ini.template | 4 ++++
 bin/install.sh                          | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/application/configs/config.ini.template b/application/configs/config.ini.template
index fdc857073..47dd50f29 100644
--- a/application/configs/config.ini.template
+++ b/application/configs/config.ini.template
@@ -46,6 +46,10 @@ db.params.username = @db.user.name@
 db.params.password = @db.user.password@
 db.params.dbname   = @db.name@
 
+; Admin access for is used to create or rebuild the database.
+opusdb.params.admin.name = @db.admin.name@
+opusdb.params.admin.password = @db.admin.password@
+
 ;SEARCH ENGINE SETTINGS
 searchengine.solr.default.service.default.endpoint.localhost.host = @searchengine.index.host@
 searchengine.solr.default.service.default.endpoint.localhost.port = @searchengine.index.port@
diff --git a/bin/install.sh b/bin/install.sh
index 8ffafa77f..689609ab9 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -305,6 +305,9 @@ sed -i -e "s!@db.user.name@!'$DB_USER_ESC'!" \
        -e "s!@db.user.password@!'$DB_USER_PASSWORD_ESC'!" \
        -e "s!@db.name@!'$DBNAME_ESC'!" "$OPUS_CONF"
 
+sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
+       -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONF"
+
 #
 # Install and configure Solr search server
 #

From 1f8fa44782051ba6cb6ab1fc0ea602bbfbda240e Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 27 Oct 2016 11:54:41 +0200
Subject: [PATCH 060/115] OPUSVIER-3068 - Added TODO for later.

---
 application/configs/config.ini.template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/configs/config.ini.template b/application/configs/config.ini.template
index 47dd50f29..c2dadd4a8 100644
--- a/application/configs/config.ini.template
+++ b/application/configs/config.ini.template
@@ -47,6 +47,7 @@ db.params.password = @db.user.password@
 db.params.dbname   = @db.name@
 
 ; Admin access for is used to create or rebuild the database.
+; TODO move to separate ini that only gets loaded by scripts for creating and updating database?
 opusdb.params.admin.name = @db.admin.name@
 opusdb.params.admin.password = @db.admin.password@
 

From 54936ddafa363277f46575ef0503c658dca2182c Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 11:30:35 +0200
Subject: [PATCH 061/115] OPUSVIER-3648 - New configuration file console.ini
 with admin account credentials.

---
 .gitignore                               |  2 +-
 RELEASE_NOTES.md                         |  9 +++--
 application/configs/config.ini.template  |  5 ---
 application/configs/console.ini.template | 44 ++++++++++++++++++++++++
 bin/install.sh                           |  6 +++-
 scripts/common/bootstrap.php             |  3 +-
 tests/import-testdata.php                |  1 +
 tests/rebuild-database.php               |  1 +
 8 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 application/configs/console.ini.template

diff --git a/.gitignore b/.gitignore
index 93c5e44c4..1a9e89520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ vendor
 
 # ignore composer runtime
 composer.phar
-composer.lock
 
 # ignore all workspace files
 workspace/**/*
@@ -19,6 +18,7 @@ workspace/**/*
 apacheconf/apache.conf
 application/configs/config.ini
 application/configs/config.xml
+application/configs/console.ini
 db/createdb.sh
 public/.htaccess
 public/js
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c295d1416..e9ccb6f21 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,9 +4,12 @@
 
 ## Release 4.5 2016-05-xx
 
-Der Schlüssel 'name' in der config.ini kann verwendet werden, um den Namen der
-Instanz zu definieren, z.B. 'OPUS 4 Demo'. Dieser Name wird z.B. im Titel von
-RSS Feeds eingesetzt, anstelle des bisherigen 'OPUS RSS Feed'.
+Der Schlüssel 'name' in der `config.ini` kann verwendet werden, um den Namen 
+der Instanz zu definieren, z.B. 'OPUS 4 Demo'. Dieser Name wird z.B. im Titel
+von RSS Feeds eingesetzt, anstelle des bisherigen 'OPUS RSS Feed'.
+
+In der neuen Konfigurationsdatei `console.ini` stehen Parameter, die nur für
+die lokal ausgeführten Skripte verwendet werden.
 
 ---
 
diff --git a/application/configs/config.ini.template b/application/configs/config.ini.template
index c2dadd4a8..fdc857073 100644
--- a/application/configs/config.ini.template
+++ b/application/configs/config.ini.template
@@ -46,11 +46,6 @@ db.params.username = @db.user.name@
 db.params.password = @db.user.password@
 db.params.dbname   = @db.name@
 
-; Admin access for is used to create or rebuild the database.
-; TODO move to separate ini that only gets loaded by scripts for creating and updating database?
-opusdb.params.admin.name = @db.admin.name@
-opusdb.params.admin.password = @db.admin.password@
-
 ;SEARCH ENGINE SETTINGS
 searchengine.solr.default.service.default.endpoint.localhost.host = @searchengine.index.host@
 searchengine.solr.default.service.default.endpoint.localhost.port = @searchengine.index.port@
diff --git a/application/configs/console.ini.template b/application/configs/console.ini.template
new file mode 100644
index 000000000..da7f4a982
--- /dev/null
+++ b/application/configs/console.ini.template
@@ -0,0 +1,44 @@
+; This file is part of OPUS. The software OPUS has been originally developed
+; at the University of Stuttgart with funding from the German Research Net,
+; the Federal Department of Higher Education and Research and the Ministry
+; of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+;
+; OPUS 4 is a complete rewrite of the original OPUS software and was developed
+; by the Stuttgart University Library, the Library Service Center
+; Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+; the Saarland University and State Library, the Saxon State Library -
+; Dresden State and University Library, the Bielefeld University Library and
+; the University Library of Hamburg University of Technology with funding from
+; the German Research Foundation and the European Regional Development Fund.
+;
+; LICENCE
+; OPUS is free software; you can redistribute it and/or modify it under the
+; terms of the GNU General Public License as published by the Free Software
+; Foundation; either version 2 of the Licence, or any later version.
+; OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+; details. You should have received a copy of the GNU General Public License
+; along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+; Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;
+; @category    Application
+; @author      Jens Schwidder <schwidder@zib.de>
+; @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+; @license     http://www.gnu.org/licenses/gpl.html General Public License
+
+;
+; Additional configuration for the OPUS command line scripts.
+;
+
+[production]
+
+; Admin access for is used to create or rebuild the database using scripts
+opusdb.params.admin.name = @db.admin.name@
+opusdb.params.admin.password = @db.admin.password@
+
+[staging : production]
+
+[testing : production]
+
+[development : production]
diff --git a/bin/install.sh b/bin/install.sh
index 689609ab9..affe2ebc0 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -55,6 +55,7 @@ fi
 # Set defaults
 APACHE_CONF="${APACHE_CONF:-apache.conf}"
 OPUS_CONF="${OPUS_CONF:-config.ini}"
+OPUS_CONSOLE_CONF="${OPUS_CONSOLE_CONF:-console.ini}"
 
 SCRIPT_NAME="`basename "$0"`"
 SCRIPT_NAME_FULL="`readlink -f "$0"`"
@@ -305,8 +306,11 @@ sed -i -e "s!@db.user.name@!'$DB_USER_ESC'!" \
        -e "s!@db.user.password@!'$DB_USER_PASSWORD_ESC'!" \
        -e "s!@db.name@!'$DBNAME_ESC'!" "$OPUS_CONF"
 
+# Add admin credentials to configuration for command line scripts
+cp console.ini.template "$OPUS_CONSOLE_CONF"
+
 sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
-       -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONF"
+       -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONSOLE_CONF"
 
 #
 # Install and configure Solr search server
diff --git a/scripts/common/bootstrap.php b/scripts/common/bootstrap.php
index 9e551e651..4f4706acd 100644
--- a/scripts/common/bootstrap.php
+++ b/scripts/common/bootstrap.php
@@ -66,7 +66,8 @@
     array(
         "config"=>array(
             APPLICATION_PATH . '/application/configs/application.ini',
-            APPLICATION_PATH . '/application/configs/config.ini'
+            APPLICATION_PATH . '/application/configs/config.ini',
+            APPLICATION_PATH . '/application/configs/console.ini'
         )
     )
 );
diff --git a/tests/import-testdata.php b/tests/import-testdata.php
index e56043821..b00350c7d 100644
--- a/tests/import-testdata.php
+++ b/tests/import-testdata.php
@@ -60,6 +60,7 @@
         "config"=>array(
             APPLICATION_PATH . '/application/configs/application.ini',
             APPLICATION_PATH . '/application/configs/config.ini',
+            APPLICATION_PATH . '/application/configs/console.ini',
             APPLICATION_PATH . '/tests/config.ini',
             APPLICATION_PATH . '/tests/tests.ini'
         )
diff --git a/tests/rebuild-database.php b/tests/rebuild-database.php
index 24c21f4b5..5e74317b3 100644
--- a/tests/rebuild-database.php
+++ b/tests/rebuild-database.php
@@ -60,6 +60,7 @@
         "config"=>array(
             APPLICATION_PATH . '/application/configs/application.ini',
             APPLICATION_PATH . '/application/configs/config.ini',
+            APPLICATION_PATH . '/application/configs/console.ini',
             APPLICATION_PATH . '/tests/config.ini',
             APPLICATION_PATH . '/tests/tests.ini'
         )

From d025abe0a806f03a62f01bfa8442d00490f43f2f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 11:43:18 +0200
Subject: [PATCH 062/115] OPUSVIER-3649 - Set password after creating
 configuration.

---
 bin/install.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index affe2ebc0..f5b4243f6 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -269,25 +269,6 @@ LimitString
 
 fi
 
-#
-# Set password for administrator account
-#
-
-while [[ -z $ADMIN_PWD || "$ADMIN_PWD" != "$ADMIN_PWD_VERIFY" ]] ;
-do
-  echo
-  read -p "Please enter password for 'admin' account: " -s ADMIN_PWD
-  echo
-  read -p "Please enter password again: " -s ADMIN_PWD_VERIFY
-  echo
-  if [[ $ADMIN_PWD != $ADMIN_PWD_VERIFY ]] ;
-  then
-    echo "Passwords do not match. Please try again."
-  fi
-done
-
-php $BASEDIR/scripts/change-password.php admin "$ADMIN_PWD"
-
 #
 # Create config.ini and set database related parameters.
 #
@@ -312,6 +293,25 @@ cp console.ini.template "$OPUS_CONSOLE_CONF"
 sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
        -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONSOLE_CONF"
 
+#
+# Set password for administrator account
+#
+
+while [[ -z $ADMIN_PWD || "$ADMIN_PWD" != "$ADMIN_PWD_VERIFY" ]] ;
+do
+  echo
+  read -p "Please enter password for OPUS 'admin' account: " -s ADMIN_PWD
+  echo
+  read -p "Please enter password again: " -s ADMIN_PWD_VERIFY
+  echo
+  if [[ $ADMIN_PWD != $ADMIN_PWD_VERIFY ]] ;
+  then
+    echo "Passwords do not match. Please try again."
+  fi
+done
+
+php $BASEDIR/scripts/change-password.php admin "$ADMIN_PWD"
+
 #
 # Install and configure Solr search server
 #

From 23f4878782f5683cf3f0db6f0724c252ac1d76fc Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 11:46:40 +0200
Subject: [PATCH 063/115] OPUSVIER-3649 - Prepare workspace before setting
 admin password.

---
 bin/install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index f5b4243f6..4c871c546 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -293,6 +293,12 @@ cp console.ini.template "$OPUS_CONSOLE_CONF"
 sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
        -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONSOLE_CONF"
 
+#
+# Prepare workspace
+#
+
+"$SCRIPT_PATH/prepare-workspace.sh"
+
 #
 # Set password for administrator account
 #
@@ -378,12 +384,6 @@ CONFIG_INI="$BASEDIR/application/configs/$OPUS_CONF"
     "${SOLR_SERVER_HOST}" "$SOLR_SERVER_PORT" "${SOLR_CONTEXT}" \
     "${SOLR_EXTRACT_SERVER_HOST}" "$SOLR_EXTRACT_SERVER_PORT" "${SOLR_EXTRACT_CONTEXT}"
 
-#
-# Prepare workspace
-#
-
-"$SCRIPT_PATH/prepare-workspace.sh"
-
 #
 # Import some test documents optionally
 #

From b5acd40a90a530b18474658b8d717be917894a8b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 15:45:30 +0200
Subject: [PATCH 064/115] OPUSVIER-3612 - Use date only for check (implizit
 00:00).

---
 scripts/cron/cron-embargo-update.php     |  2 +-
 tests/scripts/cron/EmbargoUpdateTest.php | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/scripts/cron/cron-embargo-update.php b/scripts/cron/cron-embargo-update.php
index 741acf94a..c6ab8894a 100644
--- a/scripts/cron/cron-embargo-update.php
+++ b/scripts/cron/cron-embargo-update.php
@@ -54,7 +54,7 @@
 $now->setNow();
 
 // Find documents with expired EmbargoDate and ServerDateModified < EmbargoDate
-$docfinder->setEmbargoDateBeforeNotModifiedAfter($now);
+$docfinder->setEmbargoDateBeforeNotModifiedAfter(date('Y-m-d', time()));
 
 $foundIds = $docfinder->ids();
 
diff --git a/tests/scripts/cron/EmbargoUpdateTest.php b/tests/scripts/cron/EmbargoUpdateTest.php
index c55963183..d3eb6fd81 100644
--- a/tests/scripts/cron/EmbargoUpdateTest.php
+++ b/tests/scripts/cron/EmbargoUpdateTest.php
@@ -42,35 +42,39 @@ class EmbargoUpdateTest extends CronTestCase
 
     public function testEmbargoUpdate()
     {
-        $yesterday = new Opus_Date();
-        $yesterday->setDateTime(new DateTime(date('Y-m-d H:i:s', strtotime('-1 day'))));
+        $twoDaysAgo = new Opus_Date();
+        $twoDaysAgo->setDateTime(new DateTime(date('Y-m-d H:i:s', strtotime('-2 day'))));
+
+        $yesterday = date('Y-m-d', strtotime('-1 day'));
 
         $today = date('Y-m-d', time());
-        $tomorrow = date('Y-m-d', time() + (60 * 60 * 24));
 
         $doc = new Opus_Document();
-        $doc->setEmbargoDate($today);
+        $doc->setEmbargoDate($yesterday);
         $expiredId = $doc->store();
 
         $doc = new Opus_Document();
         $noEmbargoId = $doc->store();
 
         $doc = new Opus_Document();
-        $doc->setEmbargoDate($tomorrow);
+        $doc->setEmbargoDate($today);
         $notExpiredId = $doc->store();
 
-        Opus_Document::setServerDateModifiedByIds($yesterday, array($expiredId, $noEmbargoId, $notExpiredId));
+        Opus_Document::setServerDateModifiedByIds($twoDaysAgo, array($expiredId, $noEmbargoId, $notExpiredId));
 
         $this->executeScript('cron-embargo-update.php');
 
+        // document embargo until yesterday -> therefore ServerDateModified got updated
         $doc = new Opus_Document($expiredId);
         $this->assertTrue($this->sameDay(new DateTime($today), $doc->getServerDateModified()->getDateTime()));
 
+        // document embargo until today -> therefore ServerDateModified not yet updated
         $doc = new Opus_Document($notExpiredId);
-        $this->assertTrue($this->sameDay($yesterday->getDateTime(), $doc->getServerDateModified()->getDateTime()));
+        $this->assertTrue($this->sameDay($twoDaysAgo->getDateTime(), $doc->getServerDateModified()->getDateTime()));
 
+        // no document embargo -> therefore ServerDateModified unchanged
         $doc = new Opus_Document($noEmbargoId);
-        $this->assertTrue($this->sameDay($yesterday->getDateTime(), $doc->getServerDateModified()->getDateTime()));
+        $this->assertTrue($this->sameDay($twoDaysAgo->getDateTime(), $doc->getServerDateModified()->getDateTime()));
     }
 
     private function sameDay($firstDate, $secondDate)

From f91b19990de97c0659bd979e9d55074e22b5fd5d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 17:04:53 +0200
Subject: [PATCH 065/115] OPUSVIER-1677 - Log bootstrap errors and show neutral
 message.

---
 public/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/index.php b/public/index.php
index 33083f4cb..7cdbb0ae6 100644
--- a/public/index.php
+++ b/public/index.php
@@ -87,7 +87,10 @@
 catch (Exception $e) {
     if (APPLICATION_ENV === 'production') {
         header("HTTP/1.0 500 Internal Server Error");
-        echo $e->getMessage();
+        echo '<b>OPUS 4</b>' . PHP_EOL;
+        echo '<p>Internal server error - See server logs for more information.</p>' . PHP_EOL;
+        echo 'Timestamp: ' . date('Y-m-d H:i:s', time()) . PHP_EOL;
+        error_log($e->getMessage());
     }
     else {
         throw $e;

From 844053bef442c9fa7adee7ba2d2ab023a3dbc435 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 18:14:35 +0200
Subject: [PATCH 066/115] OPUSVIER-1561 - Determine visible roles only if
 needed.

---
 modules/solrsearch/models/CollectionRoles.php | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/modules/solrsearch/models/CollectionRoles.php b/modules/solrsearch/models/CollectionRoles.php
index ed4f67036..498e4dd3c 100644
--- a/modules/solrsearch/models/CollectionRoles.php
+++ b/modules/solrsearch/models/CollectionRoles.php
@@ -34,18 +34,26 @@
 
 class Solrsearch_Model_CollectionRoles {
 
-    private $_collectionRoles = array();
+    private $_collectionRoles = null;
 
-    public function __construct() {
-        foreach (Opus_CollectionRole::fetchAll() as $collectionRole) {
-            if ($this->isVisible($collectionRole) && ($this->HasVisibleChildren($collectionRole)
-                    || $this->hasPublishedDocs($collectionRole))) {
-                array_push($this->_collectionRoles, $collectionRole);
+    /**
+     * Returns visible collection roles.
+     * @return array of Opus_CollectionRole objects
+     */
+    public function getAllVisible()
+    {
+        if (is_null($this->_collectionRoles)) {
+            $this->_collectionRoles = array();
+            foreach (Opus_CollectionRole::fetchAll() as $collectionRole) {
+                if ($this->isVisible($collectionRole)
+                    && ($this->hasVisibleChildren($collectionRole)
+                    || $this->hasPublishedDocs($collectionRole)))
+                {
+                    array_push($this->_collectionRoles, $collectionRole);
+                }
             }
         }
-    }
 
-    public function getAllVisible() {
         return $this->_collectionRoles;
     }
 
@@ -56,7 +64,8 @@ public function getAllVisible() {
      * @param Opus_CollectionRole $collectionRole
      * @return bool
      */
-    private function hasVisibleChildren($collectionRole) {
+    private function hasVisibleChildren($collectionRole)
+    {
         $rootCollection = $collectionRole->getRootCollection();
         if (is_null($rootCollection)) {
             return false;
@@ -71,7 +80,8 @@ private function hasVisibleChildren($collectionRole) {
      * @param Opus_CollectionRole $collectionRole
      * @return bool
      */
-    private function hasPublishedDocs($collectionRole) {
+    private function hasPublishedDocs($collectionRole)
+    {
         $rootCollection = $collectionRole->getRootCollection();
         if (is_null($rootCollection)) {
             return false;
@@ -80,8 +90,15 @@ private function hasPublishedDocs($collectionRole) {
         return is_array($publishedDocIDs) && !empty($publishedDocIDs);
     }
 
-    private function isVisible($collectionRole) {
+    /**
+     * Returns true if collection role is visible in browsing.
+     * @param $collectionRole Opus_CollectionRole
+     * @return bool
+     */
+    private function isVisible($collectionRole)
+    {
         return $collectionRole->getVisible() === '1' and $collectionRole->getVisibleBrowsingStart() === '1';
     }
+
 }
 

From 94ea9dfa728758d73814d69caeb514bb3371d75d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 28 Oct 2016 18:54:13 +0200
Subject: [PATCH 067/115] OPUSVIER-2286 - Use entire width of table column for
 select fields.

---
 public/layouts/opus4/css/opus.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/layouts/opus4/css/opus.css b/public/layouts/opus4/css/opus.css
index da189eaa7..240500873 100644
--- a/public/layouts/opus4/css/opus.css
+++ b/public/layouts/opus4/css/opus.css
@@ -1108,6 +1108,9 @@ dl.result_box {
 	width: 100%;
 	/* background-color: white; */
 }
+#fieldset-searchfields select {
+	width: 100%;
+}
 
 /* Series browsing */
 

From e6de738785b6611ba544eafb8457e80f4e1765da Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 28 Oct 2016 22:44:31 +0200
Subject: [PATCH 068/115] OPUSVIER-3615 - Disable database version check for
 rebuilding database.

---
 tests/rebuild-database.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/rebuild-database.php b/tests/rebuild-database.php
index 5e74317b3..3cafface9 100644
--- a/tests/rebuild-database.php
+++ b/tests/rebuild-database.php
@@ -67,6 +67,8 @@
     )
 );
 
+Zend_Registry::set('opus.disableDatabaseVersionCheck', true);
+
 // Bootstrapping application
 $application->bootstrap('Backend');
 

From bfd49a0a7c11af53108a54b6525f247e3d9cf6e6 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 28 Oct 2016 23:17:40 +0200
Subject: [PATCH 069/115] OPUSVIER-1860 - Fixed layout for export service box.

---
 public/layouts/opus4/css/opus.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/layouts/opus4/css/opus.css b/public/layouts/opus4/css/opus.css
index 240500873..944a261b4 100644
--- a/public/layouts/opus4/css/opus.css
+++ b/public/layouts/opus4/css/opus.css
@@ -110,7 +110,7 @@
 	list-style: none;
 }
 #download-fulltext{
-        word-wrap: break-word;
+    word-wrap: break-word;
 }
 
 #download-fulltext li img.file-icon {
@@ -124,9 +124,14 @@
 
 #export li{
 	display: inline;
-        float: left;
+    float: left;
 	margin-right: 5px;
 }
+#export::after {
+    content: "";
+    display: block;
+    clear: both;
+}
 #services h3,
 .facet h4{
 	padding: 0;

From a7b602f1c6d1ecbb9abdb33a282411dd5e050f58 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 31 Oct 2016 15:40:31 +0100
Subject: [PATCH 070/115] OPUSVIER-3214 - Do not throw exception for unknown
 user, just logout to avoid deleted users to get stuck in invalid session.

---
 library/Application/Controller/Plugin/SecurityRealm.php | 5 +++++
 library/Application/Security/AclProvider.php            | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/Application/Controller/Plugin/SecurityRealm.php b/library/Application/Controller/Plugin/SecurityRealm.php
index 5dee83208..e16585f37 100644
--- a/library/Application/Controller/Plugin/SecurityRealm.php
+++ b/library/Application/Controller/Plugin/SecurityRealm.php
@@ -63,7 +63,12 @@ public function routeStartup(Zend_Controller_Request_Abstract $request) {
             try {
                 $realm->setUser($identity);
             }
+            catch (Opus_Security_Exception $e) {
+                // unknown account -> clean identity (e.g. session of deleted user - OPUSVIER-3214)
+                $auth->clearIdentity();
+            }
             catch (Exception $e) {
+                // unexpected exception -> clear identity and throw
                 $auth->clearIdentity();
                 throw new Exception($e);
             }
diff --git a/library/Application/Security/AclProvider.php b/library/Application/Security/AclProvider.php
index 867b7d6b5..0ab8ec555 100644
--- a/library/Application/Security/AclProvider.php
+++ b/library/Application/Security/AclProvider.php
@@ -111,7 +111,14 @@ public function getAcls() {
         $user = Zend_Auth::getInstance()->getIdentity();
 
         if (!is_null($user)) {
-            $realm->setUser($user);
+            try {
+                $realm->setUser($user);
+            }
+            catch (Opus_Security_Exception $ose) {
+                // unknown user -> invalidate session (logout)
+                Zend_Auth::getInstance()->clearIdentity();
+                $user = null;
+            }
         }
 
         $parents = $realm->getRoles();

From f7730dc225992697e8ceff55d5131351ffc93e79 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 1 Nov 2016 14:45:06 +0100
Subject: [PATCH 071/115] OPUSVIER-3651 - XMetaDissPlus ignores documents that
 are still in embargo.

---
 modules/oai/models/DocumentList.php                      | 4 ++++
 .../modules/oai/controllers/ContainerControllerTest.php  | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/oai/models/DocumentList.php b/modules/oai/models/DocumentList.php
index 796a99b95..91e94c9c2 100644
--- a/modules/oai/models/DocumentList.php
+++ b/modules/oai/models/DocumentList.php
@@ -63,6 +63,8 @@ class Oai_Model_DocumentList {
      * TODO function contains metadataPrefix specifische criteria for generating document list (refactor!)
      */
     public function query(array $oaiRequest) {
+        $today = date('Y-m-d', time());
+
         $finder = new Opus_DocumentFinder();
 
         // add server state restrictions
@@ -72,9 +74,11 @@ public function query(array $oaiRequest) {
         if ('xMetaDissPlus' === $metadataPrefix 
             || 'xMetaDiss' === $metadataPrefix) {
             $finder->setFilesVisibleInOai();
+            $finder->setNotEmbargoedOn($today);
         }
         if ('xMetaDiss' === $metadataPrefix) {
             $finder->setTypeInList($this->xMetaDissRestriction);
+            $finder->setNotEmbargoedOn($today);
         }
         if ('epicur' === $metadataPrefix) {
             $finder->setIdentifierTypeExists('urn');
diff --git a/tests/modules/oai/controllers/ContainerControllerTest.php b/tests/modules/oai/controllers/ContainerControllerTest.php
index f604afab7..e4a8d129e 100644
--- a/tests/modules/oai/controllers/ContainerControllerTest.php
+++ b/tests/modules/oai/controllers/ContainerControllerTest.php
@@ -124,11 +124,16 @@ public function testRequestPublishedDocWithInaccessibleFile() {
         Opus_Util_File::deleteDirectory($path);
         
         $this->assertResponseCode(500);
-        $this->assertContains('access denied on all files that are associated to the requested document', $this->getResponse()->getBody());        
+        $this->assertContains(
+            'access denied on all files that are associated to the requested document', $this->getResponse()->getBody()
+        );
     }
 
     public function testRequestPublishedDocWithAccessibleFile() {
-        $this->markTestIncomplete('build breaks when running this test on ci system -- it seems that phpunit does not allow to test for file downloads');
+        $this->markTestIncomplete(
+            'build breaks when running this test on ci system ' .
+            '-- it seems that phpunit does not allow to test for file downloads'
+        );
 
         // create test file test.pdf in file system
         $config = Zend_Registry::get('Zend_Config');

From 4d79a8f6f2991fec7c8fa3012d39f3c076f8b8b4 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 1 Nov 2016 14:45:44 +0100
Subject: [PATCH 072/115] Added Ant build target for reseting testdata
 (reset-testdata).

---
 build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.xml b/build.xml
index bdfcfb308..a19c06b2f 100644
--- a/build.xml
+++ b/build.xml
@@ -202,6 +202,9 @@
         </exec>
     </target>
 
+    <target name="reset-testdata" depends="rebuild-database,rebuild-index,clean-cache">
+    </target>
+
     <target name="demo-reset" depends="rebuild-database,demo-prepare-docs,rebuild-index,demo-reset-password">
     </target>
 

From 27b0b8d9db5388771b8d1b3afd05887085cc0b19 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 1 Nov 2016 15:26:00 +0100
Subject: [PATCH 073/115] OPUSVIER-3651 - Unit Test for hiding documents in
 embargo from xMetaDissPlus.

---
 .../oai/controllers/IndexControllerTest.php   | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/tests/modules/oai/controllers/IndexControllerTest.php b/tests/modules/oai/controllers/IndexControllerTest.php
index 502d942fd..66ba46657 100644
--- a/tests/modules/oai/controllers/IndexControllerTest.php
+++ b/tests/modules/oai/controllers/IndexControllerTest.php
@@ -833,16 +833,18 @@ public function testListRecords() {
     /**
      * Regression Test for OPUSVIER-3142
      */
-    public function testListRecordsXMetaDissPlusDocumentsWithFilesOnly() {
-
+    public function testListRecordsXMetaDissPlusDocumentsWithFilesOnly()
+    {
         Zend_Registry::get('Zend_Config')->merge(
-                new Zend_Config(array(
-                    'oai' => array(
-                        'max' => array(
-                            'listrecords' => 100,
-                            'listidentifiers' => 200,
-                        )
-                    ))));
+            new Zend_Config(array(
+                'oai' => array(
+                    'max' => array(
+                        'listrecords' => 100,
+                        'listidentifiers' => 200,
+                    )
+                )
+            ))
+        );
         $this->dispatch('/oai?verb=ListRecords&metadataPrefix=xMetaDissPlus');
 
         $responseBody = $this->getResponse()->getBody();
@@ -851,6 +853,32 @@ public function testListRecordsXMetaDissPlusDocumentsWithFilesOnly() {
         "Response must not contain records without files");
     }
 
+    public function testListRecordsXMetaDissPlusDocumentsNotInEmbargoOnly()
+    {
+        $tomorrow = date('Y-m-d', strtotime('tomorrow'));
+        $yesterday = date('Y-m-d', strtotime('yesterday'));
+
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+        $doc->setEmbargoDate($tomorrow);
+        $file = $this->createTestFile('volltext.pdf');
+        $doc->addFile($file);
+        $docId = $doc->store();
+
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+        $file = $this->createTestFile('volltext2.pdf');
+        $doc->addFile($file);
+        $visibleId = $doc->store();
+
+        $this->dispatch("/oai?verb=ListRecords&metadataPrefix=xMetaDissPlus&from=$yesterday");
+
+        $body = $this->getResponse()->getBody();
+
+        $this->assertNotContains("oai::$docId", $body, 'Response should not contain embargoed document.');
+        $this->assertContains("oai::$visibleId", $body, 'Reponse should contain document without embargo.');
+    }
+
     /**
      * Regression test for OPUSVIER-3501
      */

From 3949a80c10dbb7b50cf46ab316c42d6c60f4bdef Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 1 Nov 2016 15:55:22 +0100
Subject: [PATCH 074/115] OPUSVIER-3651 - Prevent GetRecords to documents in
 embargo.

---
 modules/oai/controllers/IndexController.php   |  3 +-
 .../oai/controllers/IndexControllerTest.php   | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php
index b47cdd71f..7b419e072 100644
--- a/modules/oai/controllers/IndexController.php
+++ b/modules/oai/controllers/IndexController.php
@@ -227,7 +227,8 @@ private function __handleGetRecord(array &$oaiRequest) {
         }
 
         // do not deliver documents which are restricted by document state
-        if (is_null($document) or false === in_array($document->getServerState(), $this->_deliveringDocumentStates)) {
+        if (is_null($document) or false === in_array($document->getServerState(), $this->_deliveringDocumentStates)
+            or false === $document->hasEmbargoPassed()) {
             throw new Oai_Model_Exception('Document is not available for OAI export!', Oai_Model_Error::NORECORDSMATCH);
         }
 
diff --git a/tests/modules/oai/controllers/IndexControllerTest.php b/tests/modules/oai/controllers/IndexControllerTest.php
index 66ba46657..7a3f8c290 100644
--- a/tests/modules/oai/controllers/IndexControllerTest.php
+++ b/tests/modules/oai/controllers/IndexControllerTest.php
@@ -235,6 +235,27 @@ public function testGetRecordXMetaDissPlus() {
                 "Response must contain 'xMetaDiss'");
     }
 
+    public function testGetRecordXMetaDissPlusOnlyIfNotInEmbargo() {
+        $today = date('Y-m-d', time());
+
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+        $doc->setEmbargoDate($today);
+        $docId = $doc->store();
+
+        $this->dispatch("/oai?verb=GetRecord&metadataPrefix=XMetaDissPlus&identifier=oai::$docId");
+        $this->assertResponseCode(200);
+
+        $response = $this->getResponse()->getBody();
+        $badStrings = array("Exception", "Stacktrace", "badVerb");
+        $this->checkForCustomBadStringsInHtml($response, $badStrings);
+
+        $this->assertContains("oai::$docId", $response, "Response must contain 'oai::$docId'");
+
+        $this->assertContains('noRecordsMatch', $response);
+        $this->assertContains('Document is not available for OAI export!', $response);
+    }
+
     /**
      * Test verb=GetRecord, prefix=xMetaDissPlus.
      */
@@ -1825,4 +1846,18 @@ public function testGetRecordXMetaDissPlusLanguageCodes() {
         $this->assertEquals(1, $elements->length);
     }
 
+    public function testExampleLinkListIdentifiers()
+    {
+        $this->dispatch('/oai?verb=ListIdentifiers&metadataPrefix=oai_dc');
+
+        $body = $this->getResponse()->getBody();
+
+        $domDocument = new DOMDocument();
+        $domDocument->loadXML($body);
+
+        $elements = $domDocument->getElementsByTagName('header');
+
+        $this->assertEquals(10, $elements->length);
+    }
+
 }

From d7395f6d98e755976f6c7298f1f6a21fe4340bd9 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 1 Nov 2016 16:11:54 +0100
Subject: [PATCH 075/115] OPUSVIER-3651 - Block GetRecord in embargo only for
 xmetadiss formats.

---
 modules/oai/controllers/IndexController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php
index 7b419e072..ae016f280 100644
--- a/modules/oai/controllers/IndexController.php
+++ b/modules/oai/controllers/IndexController.php
@@ -226,14 +226,16 @@ private function __handleGetRecord(array &$oaiRequest) {
             );
         }
 
+        $metadataPrefix = $oaiRequest['metadataPrefix'];
+
         // do not deliver documents which are restricted by document state
-        if (is_null($document) or false === in_array($document->getServerState(), $this->_deliveringDocumentStates)
-            or false === $document->hasEmbargoPassed()) {
+        if (is_null($document)
+            or (false === in_array($document->getServerState(), $this->_deliveringDocumentStates))
+            or (false === $document->hasEmbargoPassed() and stripos($metadataPrefix, 'xmetadiss') === 0)) {
             throw new Oai_Model_Exception('Document is not available for OAI export!', Oai_Model_Error::NORECORDSMATCH);
         }
 
         // for xMetaDiss it must be habilitation-thesis or doctoral-thesis
-        $metadataPrefix = $oaiRequest['metadataPrefix'];
         if ('xMetaDiss' === $metadataPrefix) {
             $type = $document->getType();
             $isHabOrDoc = in_array($type, $this->_xMetaDissRestriction);

From 7d634dc93f6c351ccd39cae81abe9a2baf22da8b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Wed, 2 Nov 2016 14:07:31 +0100
Subject: [PATCH 076/115] display document's attribute belongsToBibliography on
 frontdoor

---
 modules/frontdoor/language/frontdoor.tmx      | 20 +++++++++++++++++--
 .../frontdoor/views/scripts/index/index.xslt  |  1 +
 .../scripts/index/templates/metadata.xslt     | 13 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/modules/frontdoor/language/frontdoor.tmx b/modules/frontdoor/language/frontdoor.tmx
index 93b9ada75..2478c8340 100644
--- a/modules/frontdoor/language/frontdoor.tmx
+++ b/modules/frontdoor/language/frontdoor.tmx
@@ -724,7 +724,23 @@
         </tuv>
     </tu>
 
-    
-    
+    <tu tuid="frontdoor_belongsToBibliography_0">
+        <tuv xml:lang="en">
+            <seg>no</seg>
+        </tuv>
+        <tuv xml:lang="de">
+            <seg>nein</seg>
+        </tuv>
+    </tu>
+
+   <tu tuid="frontdoor_belongsToBibliography_1">
+        <tuv xml:lang="en">
+            <seg>yes</seg>
+        </tuv>
+        <tuv xml:lang="de">
+            <seg>ja</seg>
+        </tuv>
+    </tu>
+
   </body>
 </tmx>
diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 042ce54f7..3c4659609 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -308,6 +308,7 @@
 
             <xsl:apply-templates select="Patent" />
             <xsl:apply-templates select="Licence" />
+            <xsl:apply-templates select="@BelongsToBibliography" />
         </table>
 
     </xsl:template>
diff --git a/modules/frontdoor/views/scripts/index/templates/metadata.xslt b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
index 2756bdcd8..76795961c 100644
--- a/modules/frontdoor/views/scripts/index/templates/metadata.xslt
+++ b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
@@ -105,6 +105,19 @@
         </tr>
     </xsl:template>
 
+    <xsl:template match="@BelongsToBibliography">
+        <tr>
+            <th class="name">
+                <xsl:call-template name="translateFieldname" />
+            </th>
+            <td>
+                <xsl:call-template name="translateString">
+                   <xsl:with-param name="string">frontdoor_belongsToBibliography_<xsl:value-of select="." /></xsl:with-param>
+                </xsl:call-template>
+            </td>
+        </tr>
+    </xsl:template>
+
     <!-- -->
     <!-- Templates for "external fields". -->
     <!-- -->

From 2e3dfa0254855d2bb7396fac3d8c8477143fe069 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 2 Nov 2016 14:57:47 +0100
Subject: [PATCH 077/115] OPUSVIER-2615 - Redirect to start page if already
 logged in.

---
 modules/default/controllers/AuthController.php           | 7 ++++++-
 tests/modules/default/controllers/AuthControllerTest.php | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/default/controllers/AuthController.php b/modules/default/controllers/AuthController.php
index 7a2be78d8..067711519 100644
--- a/modules/default/controllers/AuthController.php
+++ b/modules/default/controllers/AuthController.php
@@ -86,6 +86,12 @@ public function indexAction() {
      * @return void
      */
     public function loginAction() {
+        // Redirect to start page if user is already logged in
+        $identity = Zend_Auth::getInstance()->getIdentity();
+        if (empty($identity) !== true) {
+            $this->_helper->_redirector('index', 'index', 'home', array());
+            return;
+        }
 
         // Initialize form.
         $form = $this->getLoginForm();
@@ -160,7 +166,6 @@ public function loginAction() {
         $module = $this->_loginUrl['module'];
         $params = $this->_loginUrl['params'];
         $this->_helper->_redirector($action, $controller, $module, $params);
-
     }
 
     /**
diff --git a/tests/modules/default/controllers/AuthControllerTest.php b/tests/modules/default/controllers/AuthControllerTest.php
index beb7a15ef..a8dab38df 100644
--- a/tests/modules/default/controllers/AuthControllerTest.php
+++ b/tests/modules/default/controllers/AuthControllerTest.php
@@ -60,6 +60,12 @@ public function testGetLoginPage() {
         $this->assertEquals(1, $treffer);
     }
 
+    public function testLoginActionRedirectToHomeIfAlreadyLoggedIn() {
+        $this->loginUser('security1', 'security1pwd');
+        $this->dispatch('/auth/login');
+        $this->assertRedirectTo('/home');
+    }
+
     /**
      * @depends testGetLoginPage
      */

From f44bbf3b5e6e6d0a6c9c52fb615053aab54b8db6 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 2 Nov 2016 15:40:40 +0100
Subject: [PATCH 078/115] OPUSVIER-3648 - Prepare console.ini in build.xml (for
 CI-system).

---
 build.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.xml b/build.xml
index a19c06b2f..08a89d5f5 100644
--- a/build.xml
+++ b/build.xml
@@ -88,6 +88,11 @@
               toFile="${basedir}/application/configs/config.ini" filtering="true" overwrite="true">
             <filterset filtersFile="${configfile}" />
         </copy>
+
+        <copy file="${basedir}/application/configs/console.ini.template"
+              toFile="${basedir}/application/configs/console.ini" filtering="true" overwrite="true">
+            <filterset filtersFile="${configfile}" />
+        </copy>
     </target>
 
     <target name="lint" description="Prüft, ob PHP Dateien Syntaxfehler enthalten.">

From 498a3659844b624560095eedcbcfe316e915fd10 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Wed, 2 Nov 2016 15:53:03 +0100
Subject: [PATCH 079/115] disable the new feature as long as we have no config
 option to control it

---
 modules/frontdoor/views/scripts/index/index.xslt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 3c4659609..a1b0f9810 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -308,7 +308,13 @@
 
             <xsl:apply-templates select="Patent" />
             <xsl:apply-templates select="Licence" />
-            <xsl:apply-templates select="@BelongsToBibliography" />
+
+            <!-- TODO add new config option to control whether this attribute is displayed on document's frontdoor
+                      this option is needed since we cannot decide if attribute belongsToBibliography is
+                      used in a given instance or not as there are only 2 valid attribute values -->
+            <!-- as long as this new config option is missing: uncomment the following apply-template element if
+                 you wish to display belongsToBibliography on document's frontdoor -->
+            <!--xsl:apply-templates select="@BelongsToBibliography" -->
         </table>
 
     </xsl:template>

From 2db36aa9568d95664ba035dc0c5a3eba95b6b2db Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 2 Nov 2016 17:13:34 +0100
Subject: [PATCH 080/115] OPUSVIER-3232 - Deleting and adding collections fixed
 (gaps in subform numbered naming).

---
 modules/admin/forms/Document/Collections.php | 32 ++++++++++----
 modules/admin/forms/Document/Section.php     | 46 ++++++++++++++++++++
 2 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/modules/admin/forms/Document/Collections.php b/modules/admin/forms/Document/Collections.php
index 913275c43..cb20a3aec 100644
--- a/modules/admin/forms/Document/Collections.php
+++ b/modules/admin/forms/Document/Collections.php
@@ -123,13 +123,11 @@ public function processPost($data, $context) {
                     foreach ($collections as $key => $collection) {
                         $colForm = $roleForm->getSubForm($key);
 
-                        $result = $colForm->processPost($collection, $context);
+                        if (!is_null($colForm)) {
+                            $result = $colForm->processPost($collection, $context);
 
-                        if ($result === 'remove') {
-                            // TODO move to function _removeSubForm?
-                            $roleForm->removeSubForm($colForm->getName());
-                            if (count($roleForm->getSubForms()) == 0) {
-                                $this->removeSubForm($roleForm->getName());
+                            if ($result === 'remove') {
+                                $this->_removeCollection($roleForm, $colForm);
                             }
                         }
                     }
@@ -137,7 +135,17 @@ public function processPost($data, $context) {
             }
         }
     }
-    
+
+    protected function _removeCollection($roleForm, $colForm) {
+        $roleForm->removeSubForm($colForm->getName());
+        if (count($roleForm->getSubForms()) == 0) {
+            $this->removeSubForm($roleForm->getName());
+        }
+        else {
+            $roleForm->removeGapsInSubFormOrder('collection');
+        }
+    }
+
     /**
      * Erzeugt Unterformulare basierend auf den Informationen in den POST Daten.
      */
@@ -212,7 +220,11 @@ protected function _addSubForm($roleName, $data) {
 
         $this->addSubForm($roleForm, $roleName);
     }
-    
+
+    /**
+     * Adds a collection to the form.
+     * @param $colId
+     */
     protected function _addCollection($colId) {
         $collection = new Opus_Collection($colId);
         
@@ -227,8 +239,10 @@ protected function _addCollection($colId) {
         $collectionForm->populateFromModel($collection);
 
         $position = count($roleForm->getSubForms());
-            
+
         $roleForm->addSubForm($collectionForm, 'collection' . $position);
+
+        $roleForm->removeGapsInSubFormOrder('collection');
     }
     
     protected function _getRoleForm($roleName) {
diff --git a/modules/admin/forms/Document/Section.php b/modules/admin/forms/Document/Section.php
index bae82ed4b..c3d7af5ee 100644
--- a/modules/admin/forms/Document/Section.php
+++ b/modules/admin/forms/Document/Section.php
@@ -83,4 +83,50 @@ public function updateModel($model) {
         }
     }
 
+    /**
+     * TODO redundant - look into MultSubForm as base class
+     * TODO parameter is hack for OPUSVIER-3232
+     */
+    public function removeGapsInSubFormOrder($baseName) {
+        $subforms = $this->getSubForms();
+
+        $renamedSubforms = array();
+
+        $pos = 0;
+
+        foreach ($subforms as $index => $subform) {
+            $subform->setOrder($pos);
+            $name = $baseName . $pos;
+            $renamedSubforms[$name] = $subform;
+            $this->setOddEven($subform);
+            $pos++;
+        }
+
+        $this->setSubForms($renamedSubforms);
+    }
+
+    /**
+     * TODO redundant - look into MultSubForm as base class
+     */
+    public function setOddEven($subForm) {
+        $position = $subForm->getOrder();
+
+        $multiWrapper = $subForm->getDecorator('multiWrapper');
+
+        if (!is_null($multiWrapper) && $multiWrapper instanceof Zend_Form_Decorator_HtmlTag) {
+            $multiClass = $multiWrapper->getOption('class');
+            $markerClass = ($position % 2 == 0) ? 'even' : 'odd';
+
+            // TODO nicht 100% robust aber momentan ausreichend
+            if (strpos($multiClass, 'even') !== false || strpos($multiClass, 'odd') !== false) {
+                $multiClass = preg_replace('/odd|even/', $markerClass, $multiClass);
+            }
+            else {
+                $multiClass .= ' ' . $markerClass;
+            }
+
+            $multiWrapper->setOption('class', $multiClass);
+        }
+    }
+
 }

From 710c2ef9d14bc56ec280f41f7bfa0d3575518065 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 3 Nov 2016 14:35:17 +0100
Subject: [PATCH 081/115] OPUSVIER-3614 - Fixed frontdoor unit tests that don't
 set language for title.

---
 tests/modules/frontdoor/controllers/MailControllerTest.php | 2 ++
 tests/modules/frontdoor/models/AuthorsTest.php             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/modules/frontdoor/controllers/MailControllerTest.php b/tests/modules/frontdoor/controllers/MailControllerTest.php
index 19de9d8e2..58fd22998 100644
--- a/tests/modules/frontdoor/controllers/MailControllerTest.php
+++ b/tests/modules/frontdoor/controllers/MailControllerTest.php
@@ -47,6 +47,7 @@ public function setUp() {
 
         $title = new Opus_Title();
         $title->setValue('foobartitle');
+        $title->setLanguage('deu');
         $document->setTitleMain($title);       
 
         $this->documentId = $document->store();
@@ -58,6 +59,7 @@ public function setUp() {
 
         $title = new Opus_Title();
         $title->setValue('foobartitle');
+        $title->setLanguage('deu');
         $document->setTitleMain($title);
 
         $author = new Opus_Person();
diff --git a/tests/modules/frontdoor/models/AuthorsTest.php b/tests/modules/frontdoor/models/AuthorsTest.php
index c72f2a625..68d118724 100644
--- a/tests/modules/frontdoor/models/AuthorsTest.php
+++ b/tests/modules/frontdoor/models/AuthorsTest.php
@@ -46,9 +46,11 @@ public function setUp() {
         $document = $this->createTestDocument();
         $document->setServerState('published');
         $document->setType('testtype');
+        $document->setLanguage('deu');
 
         $title = new Opus_Title();
         $title->setValue('testtitle');
+        $title->setLanguage('deu');
         $document->setTitleMain($title);
 
         $author1 = new Opus_Person();

From 71f8d29e99f329de26792c861fb672b2f8c48e53 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 3 Nov 2016 14:36:52 +0100
Subject: [PATCH 082/115] OPUSVIER-1691 - Show collection role name for asigned
 root collections in frontdoor.

---
 .../scripts/index/templates/metadata.xslt     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/frontdoor/views/scripts/index/templates/metadata.xslt b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
index 2756bdcd8..4b791712c 100644
--- a/modules/frontdoor/views/scripts/index/templates/metadata.xslt
+++ b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
@@ -134,13 +134,25 @@
                         <xsl:text>/solrsearch/index/search/searchtype/collection/id/</xsl:text>
                         <xsl:value-of select="@Id" />
                     </xsl:attribute>
-
-                    <xsl:attribute name="title">
-                        <xsl:call-template name="translateString">
-                            <xsl:with-param name="string">frontdoor_collection_link</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:value-of select="@DisplayFrontdoor" />
+                    <xsl:choose>
+                        <xsl:when test="@DisplayFrontdoor != ''">
+                            <xsl:attribute name="title">
+                                <xsl:call-template name="translateString">
+                                    <xsl:with-param name="string">frontdoor_collection_link</xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:attribute>
+                            <xsl:value-of select="@DisplayFrontdoor" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:call-template name="translateStringWithDefault">
+                                <xsl:with-param name="string">default_collection_role_<xsl:value-of select="@RoleName" />
+                                </xsl:with-param>
+                                <xsl:with-param name="default">
+                                    <xsl:value-of select="@RoleName" />
+                                </xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </a>
             </td>
         </tr>

From 67c9997c0fd013982183735e4903c9e39ead1c49 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 3 Nov 2016 15:29:47 +0100
Subject: [PATCH 083/115] OPUSVIER-2275 - Modified test to adapt to number of
 documents found (at least 11).

---
 .../controllers/IndexControllerTest.php       | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/tests/modules/solrsearch/controllers/IndexControllerTest.php b/tests/modules/solrsearch/controllers/IndexControllerTest.php
index aee572753..168c53b51 100644
--- a/tests/modules/solrsearch/controllers/IndexControllerTest.php
+++ b/tests/modules/solrsearch/controllers/IndexControllerTest.php
@@ -273,7 +273,9 @@ public function testPaginationBarContainsOverallNumberOfHitsInCollectionBrowsing
      * Regression test for OPUSVIER-2147 (doctype browsing)
      */
     public function testPaginationBarContainsOverallNumberOfHitsInDoctypeBrowsing() {
-        $this->doStandardControllerTest('/solrsearch/index/search/searchtype/simple/query/*%3A*/browsing/true/doctypefq/report', null, null);
+        $this->doStandardControllerTest(
+            '/solrsearch/index/search/searchtype/simple/query/*%3A*/browsing/true/doctypefq/report', null, null
+        );
         $this->assertEquals(52, $this->getNumOfHits());
     }
 
@@ -285,12 +287,26 @@ public function testPaginationBarContainsOverallNumberOfHitsInDoctypeBrowsing()
     public function testLastPageUrlEqualsNextPageUrlDocTypeArticle() {
         $docFinder = new Opus_DocumentFinder();
         $docFinder->setType('article')->setServerState('published');
-        $this->assertEquals(20, $docFinder->count(), "Test data changed!");
 
-        $this->doStandardControllerTest('/solrsearch/index/search/searchtype/simple/query/*%3A*/browsing/true/doctypefq/article', null, null);
-        $this->assertTrue(4 == substr_count($this->getResponse()->getBody(), '/solrsearch/index/search/searchtype/simple/query/%2A%3A%2A/browsing/true/doctypefq/article/start/10/rows/10">'));
-        $this->assertNotContains('solrsearch/index/search/searchtype/simple/query/%2A%3A%2A/browsing/true/doctypefq/doctoralthesis/start/19/rows/10">', $this->getResponse()->getBody());
-        $this->assertEquals(20, $this->getNumOfHits());
+        // check if test requirements are met
+        $docCount = $docFinder->count();
+
+        $this->assertGreaterThan(10, $docCount, "Test requires at least 11 documents.");
+
+        $startLast = floor(($docCount - 1) / 10) * 10; // 10 results per page, multiple of 10
+        $start = $startLast - 10;
+
+        $this->doStandardControllerTest(
+            "/solrsearch/index/search/searchtype/simple/query/*%3A*/browsing/true/doctypefq/article/start/$start",
+            null, null
+        );
+
+        $link = '/solrsearch/index/search/searchtype/simple/query/%2A%3A%2A/browsing/true/doctypefq/article';
+
+        // check four next/last page links are all the same
+        $this->assertTrue(4 == substr_count($this->getResponse()->getBody(), "$link/start/$startLast/rows/10\">"));
+        $this->assertNotContains("$link/start/19/rows/10\">", $this->getResponse()->getBody());
+        $this->assertEquals($docCount, $this->getNumOfHits());
     }
 
     /**

From 7ed2d321fc8c6e0b4f50761c14c1ce7aadcdd7c4 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 7 Nov 2016 11:26:32 +0100
Subject: [PATCH 084/115] OPUSVIER-3563 - Visibility of BelongToBibliography in
 Frontdoor configurable. Use generic yes/no translation.

---
 .../frontdoor/controllers/IndexController.php | 24 ++++++++++++++++++-
 modules/frontdoor/language/frontdoor.tmx      | 18 --------------
 .../frontdoor/views/scripts/index/index.xslt  |  9 +++----
 .../scripts/index/templates/metadata.xslt     | 15 +++++++++---
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/modules/frontdoor/controllers/IndexController.php b/modules/frontdoor/controllers/IndexController.php
index 46cbf9f65..7d9d1bdfa 100644
--- a/modules/frontdoor/controllers/IndexController.php
+++ b/modules/frontdoor/controllers/IndexController.php
@@ -33,7 +33,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  * @version     $Id$
  *
- * TODO move XSLT functions into model class
+ * TODO move XSLT functions into model class (makes unit tests easier)
  */
 class Frontdoor_IndexController extends Application_Controller_Action {
 
@@ -48,6 +48,7 @@ class Frontdoor_IndexController extends Application_Controller_Action {
     const SORT_ORDER_FUNCTION = 'Frontdoor_IndexController::useCustomSortOrder';
     const CHECK_LANGUAGE_FILE_FUNCTION = 'Frontdoor_IndexController::checkLanguageFile';
     const GET_STYLESHEET_FUNCTION = 'Frontdoor_IndexController::getStylesheet';
+    const IS_DISPLAY_FIELD_FUNCTION = 'Frontdoor_IndexController::isDisplayField';
 
     /**
      * Displays the metadata of a document.
@@ -159,6 +160,7 @@ public function indexAction() {
         $proc->registerPHPFunctions(self::SORT_ORDER_FUNCTION);
         $proc->registerPHPFunctions(self::CHECK_LANGUAGE_FILE_FUNCTION);
         $proc->registerPHPFunctions(self::GET_STYLESHEET_FUNCTION);
+        $proc->registerPHPFunctions(self::IS_DISPLAY_FIELD_FUNCTION);
         $proc->registerPHPFunctions('urlencode');
         $proc->importStyleSheet($xslt);
 
@@ -461,6 +463,26 @@ static public function translate($key) {
         return $translate->_($key);
     }
 
+    /**
+     * Check if a field should be displayed in the frontdoor.
+     * @param string $name Name of field
+     * @return bool
+     */
+    static public function isDisplayField($name) {
+        $config = Zend_Registry::get('Zend_Config');
+
+        if (is_null($config)) {
+            return false;
+        }
+
+        if (isset($config->frontdoor->metadata->$name)) {
+            return $config->frontdoor->metadata->$name == 1;
+        }
+        else {
+            return false;
+        }
+    }
+
     /**
      * Gateway function to Zend's translation facilities.  Falls back to default
      * if no translation exists.
diff --git a/modules/frontdoor/language/frontdoor.tmx b/modules/frontdoor/language/frontdoor.tmx
index 2478c8340..64aa20731 100644
--- a/modules/frontdoor/language/frontdoor.tmx
+++ b/modules/frontdoor/language/frontdoor.tmx
@@ -724,23 +724,5 @@
         </tuv>
     </tu>
 
-    <tu tuid="frontdoor_belongsToBibliography_0">
-        <tuv xml:lang="en">
-            <seg>no</seg>
-        </tuv>
-        <tuv xml:lang="de">
-            <seg>nein</seg>
-        </tuv>
-    </tu>
-
-   <tu tuid="frontdoor_belongsToBibliography_1">
-        <tuv xml:lang="en">
-            <seg>yes</seg>
-        </tuv>
-        <tuv xml:lang="de">
-            <seg>ja</seg>
-        </tuv>
-    </tu>
-
   </body>
 </tmx>
diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 5e506da5c..30a6f1e2a 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -309,12 +309,9 @@
             <xsl:apply-templates select="Patent" />
             <xsl:apply-templates select="Licence" />
 
-            <!-- TODO add new config option to control whether this attribute is displayed on document's frontdoor
-                      this option is needed since we cannot decide if attribute belongsToBibliography is
-                      used in a given instance or not as there are only 2 valid attribute values -->
-            <!-- as long as this new config option is missing: uncomment the following apply-template element if
-                 you wish to display belongsToBibliography on document's frontdoor -->
-            <!--xsl:apply-templates select="@BelongsToBibliography" -->
+            <xsl:if test="php:functionString('Frontdoor_IndexController::isDisplayField', 'BelongsToBibliography')">
+                <xsl:apply-templates select="@BelongsToBibliography" />" />
+            </xsl:if>
         </table>
 
     </xsl:template>
diff --git a/modules/frontdoor/views/scripts/index/templates/metadata.xslt b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
index 2e15de211..8156b1887 100644
--- a/modules/frontdoor/views/scripts/index/templates/metadata.xslt
+++ b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
@@ -111,9 +111,18 @@
                 <xsl:call-template name="translateFieldname" />
             </th>
             <td>
-                <xsl:call-template name="translateString">
-                   <xsl:with-param name="string">frontdoor_belongsToBibliography_<xsl:value-of select="." /></xsl:with-param>
-                </xsl:call-template>
+                <xsl:choose>
+                    <xsl:when test=". = '1'">
+                        <xsl:call-template name="translateString">
+                           <xsl:with-param name="string">answer_yes</xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:call-template name="translateString">
+                           <xsl:with-param name="string">answer_no</xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:otherwise>
+                </xsl:choose>
             </td>
         </tr>
     </xsl:template>

From b1a03e2abc337b881f56c13b3ee8cd6f2b2dfa06 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 7 Nov 2016 11:32:41 +0100
Subject: [PATCH 085/115] OPUSVIER-3563 - Fixed HTML. Added CSS class for
 value.  Disabled by default in application.ini.

---
 application/configs/application.ini                           | 4 +++-
 modules/frontdoor/views/scripts/index/index.xslt              | 2 +-
 modules/frontdoor/views/scripts/index/templates/metadata.xslt | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/configs/application.ini b/application/configs/application.ini
index d7c17e8f9..b50f95b5d 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -53,7 +53,6 @@ includePaths.library = APPLICATION_PATH "/library"
 bootstrap.path = APPLICATION_PATH "/library/Application/Bootstrap.php"
 bootstrap.class = "Application_Bootstrap"
 appnamespace = "Application"
-autoloaderNamespaces.apache = 'Apache_'
 autoloaderNamespaces.opus = 'Opus_'
 autoloaderNamespaces.app = 'Application_'
 
@@ -202,6 +201,9 @@ help.separate = false
 frontdoor.numOfShortAbstractChars = 0
 frontdoor.files.customSorting = 1
 
+; Visibility of fields in frontdoor (right now just BelongsToBibliography)
+; frontdoor.metadata.BelongsToBibliography = 1
+
 ; PLUGINS
 plugins.export.default.class = 'Export_Model_XmlExport'
 
diff --git a/modules/frontdoor/views/scripts/index/index.xslt b/modules/frontdoor/views/scripts/index/index.xslt
index 30a6f1e2a..5c8e1e17a 100644
--- a/modules/frontdoor/views/scripts/index/index.xslt
+++ b/modules/frontdoor/views/scripts/index/index.xslt
@@ -310,7 +310,7 @@
             <xsl:apply-templates select="Licence" />
 
             <xsl:if test="php:functionString('Frontdoor_IndexController::isDisplayField', 'BelongsToBibliography')">
-                <xsl:apply-templates select="@BelongsToBibliography" />" />
+                <xsl:apply-templates select="@BelongsToBibliography" />
             </xsl:if>
         </table>
 
diff --git a/modules/frontdoor/views/scripts/index/templates/metadata.xslt b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
index 8156b1887..bb112c851 100644
--- a/modules/frontdoor/views/scripts/index/templates/metadata.xslt
+++ b/modules/frontdoor/views/scripts/index/templates/metadata.xslt
@@ -110,7 +110,7 @@
             <th class="name">
                 <xsl:call-template name="translateFieldname" />
             </th>
-            <td>
+            <td class="value BelongsToBibliography">
                 <xsl:choose>
                     <xsl:when test=". = '1'">
                         <xsl:call-template name="translateString">

From b6b9d8413549e2100062093c9b672b50f14d007b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 7 Nov 2016 11:49:12 +0100
Subject: [PATCH 086/115] OPUSVIER-3563 - Added unit tests for
 BelongsToBibliography frontdoor configuration switch.

---
 .../controllers/IndexControllerTest.php       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/modules/frontdoor/controllers/IndexControllerTest.php b/tests/modules/frontdoor/controllers/IndexControllerTest.php
index a829b9deb..94c5818fb 100644
--- a/tests/modules/frontdoor/controllers/IndexControllerTest.php
+++ b/tests/modules/frontdoor/controllers/IndexControllerTest.php
@@ -1240,4 +1240,26 @@ public function testMetaTagsForUrns() {
         $this->assertXpath('//meta[@name="DC.Identifier" and @content="' . $urnResolverUrl . 'urn:nbn:op:123"]');
     }
 
+    public function testBelongsToBibliographyTurnedOn() {
+        $this->useEnglish();
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'frontdoor' => array('metadata' => array('BelongsToBibliography' => 1)
+        ))));
+
+        $this->dispatch('/frontdoor/index/index/docId/146');
+
+        $this->assertXpath('//td[contains(@class, "BelongsToBibliography")]');
+        $this->assertXpathContentContains('//td[contains(@class, "BelongsToBibliography")]', 'Yes');
+    }
+
+    public function testBelongsToBibliographyTurnedOff() {
+        Zend_Registry::get('Zend_Config')->merge(new Zend_Config(array(
+            'frontdoor' => array('metadata' => array('BelongsToBibliography' => 0)
+        ))));
+
+        $this->dispatch('/frontdoor/index/index/docId/146');
+
+        $this->assertNotXpath('//td[contains(@class, "BelongsToBibliography")]');
+    }
+
 }

From 278c658ff3f0898a6f51dfd82ba031a058a3345f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Mon, 7 Nov 2016 11:54:06 +0100
Subject: [PATCH 087/115] OPUSVIER-3563 - Default in application.ini
 festgelegt.

---
 application/configs/application.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/configs/application.ini b/application/configs/application.ini
index b50f95b5d..a118c5dff 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -202,7 +202,7 @@ frontdoor.numOfShortAbstractChars = 0
 frontdoor.files.customSorting = 1
 
 ; Visibility of fields in frontdoor (right now just BelongsToBibliography)
-; frontdoor.metadata.BelongsToBibliography = 1
+frontdoor.metadata.BelongsToBibliography = 0
 
 ; PLUGINS
 plugins.export.default.class = 'Export_Model_XmlExport'

From ea902a46b01b49a3f968f624c76b10c0eff3227d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 8 Nov 2016 11:42:46 +0100
Subject: [PATCH 088/115] OPUSVIER-3461 - jQuery and JQuery-UI installed by
 composer.

---
 application/configs/application.ini | 4 +++-
 composer.json                       | 8 ++++++--
 public/layouts/opus4/common.phtml   | 9 +++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/application/configs/application.ini b/application/configs/application.ini
index a118c5dff..9e491e47a 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -192,7 +192,9 @@ log.prepare.xml = false
 log.untranslated = false
 
 ; PATH TO JQUERY JAVASCRIPT LIBRARY (relative to public)
-javascript.jquery.path = js/jquery.js
+javascript.jquery.path = assets/jquery/jquery.js
+javascript.jqueryui.path = assets/jquery-ui/jquery-ui.js
+css.jqueryui.path = assets/jquery-ui/themes/base/jquery-ui.css
 
 ; HELP RELATED SETTINGS
 ; display a separate page for each faq
diff --git a/composer.json b/composer.json
index 5f6173f19..c7d6c8cda 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,9 @@
     "solarium/solarium": "3.4.1",
     "opus4-repo/framework": "dev-master",
     "opus4-repo/search": "4.5.0-RC1",
-    "components/jquery": "1.9.*"
+    "components/jquery": "1.12.4",
+    "components/jqueryui": "1.12.1",
+    "robloach/component-installer": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8.24",
@@ -31,6 +33,8 @@
       "@linkDbSchema"
     ],
     "linkDbSchema": "ln -svf -t db ../vendor/opus4-repo/framework/db/schema"
+  },
+  "config": {
+    "component-dir": "public/assets"
   }
 }
-
diff --git a/public/layouts/opus4/common.phtml b/public/layouts/opus4/common.phtml
index 12996d1dc..eaf0bdd4c 100755
--- a/public/layouts/opus4/common.phtml
+++ b/public/layouts/opus4/common.phtml
@@ -54,6 +54,7 @@ if (isset($this->title)) {
 }
 
 $this->headLink()
+    ->appendStylesheet($this->baseUrl() . '/' . $config->css->jqueryui->path, 'screen')
     ->appendStylesheet($this->layoutPath() . '/css/opus.css', 'screen,print')
     ->appendStylesheet($this->layoutPath() . '/css/admin.css', 'screen,print')
     ->headLink(array(
@@ -84,6 +85,7 @@ else if (in_array($this->moduleName, array('publish'))) {
 }
 
 if ($this->jQueryEnabled()) {
+    $this->headScript()->prependFile($this->baseUrl() . '/' . $config->javascript->jqueryui->path);
     $this->headScript()->prependFile($this->baseUrl() . '/' . $config->javascript->jquery->path);
 
     foreach ($jsFiles as $filename) {
@@ -116,6 +118,13 @@ if (isset($config->javascript->latex->mathjax)) {
 
 <?= $this->headLink()->setIndent(8) ?>
 
+
+        <script type="text/javascript">
+        //<![CDATA[
+            window.opusBaseUrl = '<?= $this->serverUrl() . $this->baseUrl() ?>';
+        //]]>
+        </script>
+
 <?= $this->headScript()->setIndent(8) ?>
 
 	<!--[if IE 6]>

From 581a2a2092a32a4ea7ec10b5234ebafa50a6f883 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 8 Nov 2016 11:48:36 +0100
Subject: [PATCH 089/115] OPUSVIER-3652 - Added autocomplete to GND subjects.

---
 library/Application/Data/SubjectProvider.php  | 50 +++++++++++++++
 .../controllers/AutocompleteController.php    | 62 +++++++++++++++++++
 modules/admin/forms/Document/Subject.php      |  4 +-
 public/layouts/opus4/css/admin.css            |  3 +
 public/layouts/opus4/js/theme.js              | 15 ++++-
 .../Application/Data/SubjectProviderTest.php  | 20 ++++++
 6 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 library/Application/Data/SubjectProvider.php
 create mode 100644 modules/admin/controllers/AutocompleteController.php
 create mode 100644 tests/library/Application/Data/SubjectProviderTest.php

diff --git a/library/Application/Data/SubjectProvider.php b/library/Application/Data/SubjectProvider.php
new file mode 100644
index 000000000..8b75df38d
--- /dev/null
+++ b/library/Application/Data/SubjectProvider.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the North Rhine-Westphalian Library Service Center,
+ * the Cooperative Library Network Berlin-Brandenburg, the Saarland University
+ * and State Library, the Saxon State Library - Dresden State and University
+ * Library, the Bielefeld University Library and the University Library of
+ * Hamburg University of Technology with funding from the German Research
+ * Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Module_Admin
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Application_Data_SubjectProvider {
+
+    /**
+     * Returns matching values as suggestions for autocomplete.
+     *
+     * value
+     * extkey
+     *
+     * @param $term
+     * @return array
+     */
+    public function getValues($term) {
+        return Opus_Subject::getMatchingSubjects($term);
+    }
+
+}
\ No newline at end of file
diff --git a/modules/admin/controllers/AutocompleteController.php b/modules/admin/controllers/AutocompleteController.php
new file mode 100644
index 000000000..36c3c5c7c
--- /dev/null
+++ b/modules/admin/controllers/AutocompleteController.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the North Rhine-Westphalian Library Service Center,
+ * the Cooperative Library Network Berlin-Brandenburg, the Saarland University
+ * and State Library, the Saxon State Library - Dresden State and University
+ * Library, the Bielefeld University Library and the University Library of
+ * Hamburg University of Technology with funding from the German Research
+ * Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Module_Admin
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/**
+ * Controller for providing JSON formatted data used for autocomplete
+ * functions in forms.
+ */
+class Admin_AutocompleteController extends Application_Controller_ModuleAccess
+{
+
+    public function init() {
+        parent::init();
+
+        $this->_helper->viewRenderer->setNoRender(true);
+        $this->_helper->layout()->disableLayout();
+    }
+
+
+    public function subjectAction() {
+        $term = $this->getRequest()->getParam('term');
+
+        if (!is_null($term)) {
+            $provider = new Application_Data_SubjectProvider();
+
+            $data = $provider->getValues($term);
+        }
+
+        echo json_encode($data);
+    }
+
+}
\ No newline at end of file
diff --git a/modules/admin/forms/Document/Subject.php b/modules/admin/forms/Document/Subject.php
index 2ec53bb9b..8e37ce40a 100644
--- a/modules/admin/forms/Document/Subject.php
+++ b/modules/admin/forms/Document/Subject.php
@@ -112,7 +112,9 @@ public function init() {
         }
         $this->addElement($element);
         
-        $this->addElement('Text', self::ELEMENT_VALUE, array('required' => true, 'size' => 30));
+        $this->addElement('Text', self::ELEMENT_VALUE, array(
+            'required' => true, 'size' => 30, 'class' => 'subject ui-autocomplete-input'
+        ));
         $this->addElement('Text', self::ELEMENT_EXTERNAL_KEY);
     }
 
diff --git a/public/layouts/opus4/css/admin.css b/public/layouts/opus4/css/admin.css
index 817f268d7..04965d8e4 100644
--- a/public/layouts/opus4/css/admin.css
+++ b/public/layouts/opus4/css/admin.css
@@ -1631,3 +1631,6 @@ table + .paginationControl{
 .admin_config legend {
 }
 
+.ui-widget-content {
+   font-size: 0.9em;
+}
\ No newline at end of file
diff --git a/public/layouts/opus4/js/theme.js b/public/layouts/opus4/js/theme.js
index 753aa72a4..8a375b1e5 100644
--- a/public/layouts/opus4/js/theme.js
+++ b/public/layouts/opus4/js/theme.js
@@ -70,4 +70,17 @@ $(document).ready(function() {
 			  $(this).removeClass('blur');
 		}
 	});
-});
+
+    // add autocomplete to GND subject input
+    $( '.subject' ).autocomplete({
+        source: window.opusBaseUrl + "/admin/autocomplete/subject",
+        minLength: 2,
+        select: function(event, ui) {
+            // automaticaly set external key field
+            if (typeof ui.item.extkey !== 'undefinded') {
+                var elemId = "#" + this.id.replace('Value', 'ExternalKey');
+                $(elemId).val(ui.item.extkey);
+            }
+        }
+    });
+});
\ No newline at end of file
diff --git a/tests/library/Application/Data/SubjectProviderTest.php b/tests/library/Application/Data/SubjectProviderTest.php
new file mode 100644
index 000000000..845f8fd51
--- /dev/null
+++ b/tests/library/Application/Data/SubjectProviderTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: jens
+ * Date: 07.11.16
+ * Time: 17:59
+ */
+
+class Application_Data_SubjectProviderTest extends ControllerTestCase {
+
+    public function testGetValues() {
+        $provider = new Application_Data_SubjectProvider();
+
+        $data = $provider->getValues('sch');
+
+        $this->assertInternalType('array', $data);
+        $this->assertCount(20, $data);
+    }
+
+}
\ No newline at end of file

From 4b8f836a62bc9dd3c28455bec24fa6c792df1fe8 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 15 Nov 2016 13:42:01 +0100
Subject: [PATCH 090/115] Ignore public/assets containing files installed with
 Composer.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1a9e89520..2c8a24da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ db/createdb.sh
 public/.htaccess
 public/js
 public/series_logos
+public/assets
 
 build/
 tests/build/

From 34c247e2e95c5b076c4db0f61c9300e9f2a98b1f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 16 Nov 2016 14:35:53 +0100
Subject: [PATCH 091/115] OPUSVIER-3648 - Added helper class for strings.

---
 library/Application/Util/String.php           | 75 +++++++++++++++++++
 tests/library/Application/Util/StringTest.php | 54 +++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 library/Application/Util/String.php
 create mode 100644 tests/library/Application/Util/StringTest.php

diff --git a/library/Application/Util/String.php b/library/Application/Util/String.php
new file mode 100644
index 000000000..0788be570
--- /dev/null
+++ b/library/Application/Util/String.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Application_Util
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/**
+ * Helper class with string functions.
+ */
+class Application_Util_String
+{
+
+    /**
+     * Replaces keys in a string with values from an array.
+     *
+     * @param $content string
+     * @param $properties array with replacement values
+     * @return string
+     */
+    public static function replaceProperties($content, $properties)
+    {
+        $filtered = $content;
+
+        foreach ($properties as $key => $value)
+        {
+            $filtered = str_replace($key, self::quoteValue($value), $filtered);
+        }
+
+        return $filtered;
+    }
+
+    /**
+     * Puts double quotes around a string.
+     *
+     * @param $value
+     * @return string
+     */
+    public static function quoteValue($value)
+    {
+        if (strpos($value, '"') !== false)
+        {
+            $value = str_replace('"', '\"', $value);
+        }
+
+        return "\"$value\"";
+    }
+
+}
diff --git a/tests/library/Application/Util/StringTest.php b/tests/library/Application/Util/StringTest.php
new file mode 100644
index 000000000..2a185f803
--- /dev/null
+++ b/tests/library/Application/Util/StringTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Application_Util_StringTest extends ControllerTestCase
+{
+
+    public function testReplaceProperties() {
+        $content = "User @user@ and parameters. value1 value1";
+        $expected = 'User "admin" and "password". "value2" "value2"';
+        $properties = array(
+            '@user@' => 'admin',
+            'parameters' => 'password',
+            'value1' => 'value2'
+        );
+
+        $this->assertEquals($expected, Application_Util_String::replaceProperties($content, $properties));
+    }
+
+    public function testQuoteString() {
+        $this->assertEquals('"dummy"', Application_Util_String::quoteValue('dummy'));
+        $this->assertEquals('"dum\"my"', Application_Util_String::quoteValue('dum"my'));
+    }
+
+}
\ No newline at end of file

From 3a7008e45d183aec53c6a9f08c48c397a389746b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 16 Nov 2016 14:43:42 +0100
Subject: [PATCH 092/115] OPUSVIER-3648 - Added quoting option.

---
 library/Application/Util/String.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/Application/Util/String.php b/library/Application/Util/String.php
index 0788be570..cb3869e2c 100644
--- a/library/Application/Util/String.php
+++ b/library/Application/Util/String.php
@@ -44,15 +44,21 @@ class Application_Util_String
      * @param $properties array with replacement values
      * @return string
      */
-    public static function replaceProperties($content, $properties)
+    public static function replaceProperties($content, $properties, $quote = true)
     {
         $filtered = $content;
 
-        foreach ($properties as $key => $value)
-        {
-            $filtered = str_replace($key, self::quoteValue($value), $filtered);
+        $keys = array_keys($properties);
+
+        if ($quote) {
+            array_walk($properties, function(&$value, $key)
+            {
+                $value = self::quoteValue($value);
+            });
         }
 
+        $filtered = str_replace($keys, $properties, $filtered);
+
         return $filtered;
     }
 

From b99bd3c1a8f4b843ae03619660b6300863dca828 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 16 Nov 2016 14:44:35 +0100
Subject: [PATCH 093/115] OPUSVIER-3648 - Added helper class for files.

---
 library/Application/Util/File.php           | 63 ++++++++++++++++
 tests/library/Application/Util/FileTest.php | 83 +++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 library/Application/Util/File.php
 create mode 100644 tests/library/Application/Util/FileTest.php

diff --git a/library/Application/Util/File.php b/library/Application/Util/File.php
new file mode 100644
index 000000000..66fd66670
--- /dev/null
+++ b/library/Application/Util/File.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Application_Util
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/**
+ * Helper class for file operations.
+ */
+class Application_Util_File
+{
+
+    /**
+     * Copies a file and replaces keys with values in the copied file.
+     *
+     * @param $source Path to source file
+     * @param $dest Path for destination file
+     * @param $properties Array with properties for replacement
+     * @throws Exception
+     */
+    public static function copyAndFilter($source, $dest, $properties) {
+        if (is_readable($source))
+        {
+            $content = file_get_contents($source);
+
+            $content = Application_Util_String::replaceProperties($content, $properties);
+
+            file_put_contents($dest, $content);
+        }
+        else
+        {
+            throw new Exception("could not read source file ($source)");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tests/library/Application/Util/FileTest.php b/tests/library/Application/Util/FileTest.php
new file mode 100644
index 000000000..c6cfc3359
--- /dev/null
+++ b/tests/library/Application/Util/FileTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Application_Util_FileTest extends ControllerTestCase
+{
+
+    public function testCopyAndFilter() {
+        $source = $this->createTestFile('source.txt');
+        $dest = $this->createTestFile('test.txt');
+
+        $sourcePath = $source->getTempFile();
+        $destPath = $dest->getTempFile();
+
+        $properties = array(
+            '@db.user.name@' => 'opus4user',
+            '@db.user.password@' => 'dummypwd'
+        );
+
+        $content = <<<TEXT
+# Filtered File
+db.user = @db.user.name@
+db.password = @db.user.password@
+TEXT;
+
+        file_put_contents($sourcePath, $content);
+
+        Application_Util_File::copyAndFilter($sourcePath, $destPath, $properties);
+
+        $result = file_get_contents($destPath);
+
+        $expected = <<<TEXT
+# Filtered File
+db.user = "opus4user"
+db.password = "dummypwd"
+TEXT;
+
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage could not read source file
+     */
+    public function testCopyAndFilterMissingSource() {
+        $source = APPLICATION_PATH . '/tests/resources/doesnotexist.txt';
+        $dest = $this->createTestFile('dest.txt');
+
+        $properties = array('@user@', 'admin');
+
+        Application_Util_File::copyAndFilter($source, $dest->getTempFile(), $properties);
+    }
+
+}
\ No newline at end of file

From fe89d1884f397cce8bdd6e5fce5cd1883aa930f3 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 16 Nov 2016 14:47:29 +0100
Subject: [PATCH 094/115] OPUSVIER-3648 - Added class for reading properties
 from shell script.

---
 library/Application/Util/ShellScript.php      | 119 ++++++++++++++++++
 .../Application/Util/ShellScriptTest.php      |  75 +++++++++++
 tests/resources/shellscript.txt               |  29 +++++
 3 files changed, 223 insertions(+)
 create mode 100644 library/Application/Util/ShellScript.php
 create mode 100644 tests/library/Application/Util/ShellScriptTest.php
 create mode 100644 tests/resources/shellscript.txt

diff --git a/library/Application/Util/ShellScript.php b/library/Application/Util/ShellScript.php
new file mode 100644
index 000000000..f83034ed5
--- /dev/null
+++ b/library/Application/Util/ShellScript.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * Parses values of variables from shell scripts.
+ *
+ * @category    Application
+ * @package     Application_Util
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+class Application_Util_ShellScript
+{
+
+    /**
+     * @var array Key -> Value pairs found in shell script
+     */
+    private $_properties;
+
+    /**
+     * Application_Util_ShellScript constructor.
+     * @param $path
+     */
+    public function __construct($path)
+    {
+        $this->_properties = self::getPropertiesFromScript($path);
+    }
+
+    /**
+     * Returns value for property if found in shell script.
+     * @param $name Property name
+     * @return null|string
+     */
+    public function getProperty($name)
+    {
+        if (array_key_exists($name, $this->_properties)) {
+            return $this->_properties[$name];
+        }
+        else {
+            return null;
+        }
+    }
+
+    /**
+     * Read property values from shell script.
+     *
+     * @param $path Path to shell script
+     * @return array Map with names and values of properties
+     * @throws Exception
+     */
+    public static function getPropertiesFromScript($path)
+    {
+        $properties = array();
+
+        if (!is_readable($path))
+        {
+            throw new Exception('cannot read file');
+        }
+
+        $file = fopen($path, 'r');
+
+        if ($file)
+        {
+            while (($line = fgets($file)) !== false)
+            {
+                $line = trim($line);
+
+                // ignore comments
+                if (preg_match('/^#/', $line))
+                {
+                    continue;
+                }
+                else {
+                    if (preg_match('/[A-Za-z0-9]+=.+/', $line))
+                    {
+                        $property = preg_split('/\s*=\s*/', $line, 2);
+                        if (count($property) === 2)
+                        {
+                            $properties[$property[0]] = trim($property[1], '"\'');
+                        }
+                    }
+                }
+            }
+
+            fclose($file);
+        }
+        else {
+            throw new Exception('could not open file');
+        }
+
+        return $properties;
+    }
+
+}
diff --git a/tests/library/Application/Util/ShellScriptTest.php b/tests/library/Application/Util/ShellScriptTest.php
new file mode 100644
index 000000000..d8e161035
--- /dev/null
+++ b/tests/library/Application/Util/ShellScriptTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Tests
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+class Application_Util_ShellScriptTest extends ControllerTestCase
+{
+
+    private $scriptPath;
+
+    public function setUp() {
+        parent::setUp();
+
+        $this->scriptPath = APPLICATION_PATH . '/tests/resources/shellscript.txt';
+    }
+
+    public function testGetPropertiesFromScript() {
+        $properties = Application_Util_ShellScript::getPropertiesFromScript($this->scriptPath);
+
+        $this->assertCount(8, $properties);
+
+        $this->assertArrayHasKey('user', $properties);
+        $this->assertEquals('opus4admin', $properties['user']);
+
+        $this->assertArrayHasKey('password', $properties);
+        $this->assertEquals('abc456%pwd', $properties['password']);
+
+        $this->assertArrayHasKey('port', $properties);
+        $this->assertEquals('3308', $properties['port']);
+
+        $this->assertArrayHasKey('dbname', $properties);
+        $this->assertEquals('opusdb', $properties['dbname']);
+
+        $this->assertArrayHasKey('mysql_bin', $properties);
+        $this->assertEquals('/usr/bin/mysql', $properties['mysql_bin']);
+
+        $this->assertArrayHasKey('schema_file', $properties);
+        $this->assertEquals('schema/opus4schema.sql', $properties['schema_file']);
+
+        $this->assertArrayHasKey('master_dir', $properties);
+        $this->assertEquals('masterdata/', $properties['master_dir']);
+
+        $this->assertArrayHasKey('mysql', $properties);
+        $this->assertEquals('${mysql} --password=`printf %q "${password}"`', $properties['mysql']);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/resources/shellscript.txt b/tests/resources/shellscript.txt
new file mode 100644
index 000000000..e1559e131
--- /dev/null
+++ b/tests/resources/shellscript.txt
@@ -0,0 +1,29 @@
+#! /bin/bash
+
+set -e
+
+# comment line
+
+# user should has rights to drop and create a database (grant rights)
+user= 'opus4admin'
+
+password='abc456%pwd'
+
+# host=localhost
+
+port= '3308'
+dbname='opusdb'
+
+  mysql_bin=/usr/bin/mysql
+
+schema_file=schema/opus4schema.sql
+
+master_dir=masterdata/
+
+mysql="${mysql_bin} --default-character-set=utf8 --user=`printf %q "${user}"` --host=`printf %q "${host}"` --port=`printf %q "${port}"`"
+
+if [ -n "${password}" ]; then
+     mysql="${mysql} --password=`printf %q "${password}"`"
+fi
+
+echo "Creating database: '${dbname}'"

From bbec4fe71294aa6176a3928688a2532a32888b02 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 16 Nov 2016 16:37:33 +0100
Subject: [PATCH 095/115] OPUSVIER-3648 - Added update code that creates
 console.ini, if necessary.

---
 bin/update.sh                                 |  27 +++
 library/Application/Update.php                |  82 +++++++++
 library/Application/Update/ConsoleIni.php     | 171 ++++++++++++++++++
 library/Application/Update/PluginAbstract.php |  50 +++++
 scripts/update/update.php                     |  63 +++++++
 .../Application/Update/ConsoleIniTest.php     |  43 +++++
 6 files changed, 436 insertions(+)
 create mode 100755 bin/update.sh
 create mode 100644 library/Application/Update.php
 create mode 100644 library/Application/Update/ConsoleIni.php
 create mode 100644 library/Application/Update/PluginAbstract.php
 create mode 100644 scripts/update/update.php
 create mode 100644 tests/library/Application/Update/ConsoleIniTest.php

diff --git a/bin/update.sh b/bin/update.sh
new file mode 100755
index 000000000..2104d1536
--- /dev/null
+++ b/bin/update.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# LICENCE
+# This code is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This code is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# @author      Jens Schwidder <schwidder@zib.de>
+# @copyright   Copyright (c) 2010-2016, OPUS 4 development team
+# @license     http://www.gnu.org/licenses/gpl.html General Public License
+#
+
+set -e
+
+SCRIPT_NAME="`basename "$0"`"
+SCRIPT_NAME_FULL="`readlink -f "$0"`"
+SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
+
+BASEDIR="`dirname "$SCRIPT_PATH"`"
+
+php $BASEDIR/scripts/update/update.php
diff --git a/library/Application/Update.php b/library/Application/Update.php
new file mode 100644
index 000000000..102a52c76
--- /dev/null
+++ b/library/Application/Update.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Application
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/**
+ * Class for performing updates of OPUS 4.
+ *
+ * TODO logging to file
+ * TODO output version numbers
+ */
+class Application_Update extends Application_Update_PluginAbstract
+{
+
+    /**
+     * Bootstrap Zend_Application for update process.
+     */
+    public function bootstrap()
+    {
+        $configFiles = array(
+            APPLICATION_PATH . '/application/configs/application.ini',
+            APPLICATION_PATH . '/application/configs/config.ini'
+        );
+
+        $consoleIniPath = APPLICATION_PATH . '/application/configs/console.ini';
+
+        if (is_readable($consoleIniPath))
+        {
+            $configFiles[] = $consoleIniPath;
+        }
+
+        $application = new Zend_Application(APPLICATION_ENV, array("config"=>$configFiles));
+
+        $application->bootstrap('Configuration');
+    }
+
+    /**
+     * Perform update.
+     */
+    public function run()
+    {
+        $this->log('Updating OPUS 4 ...');
+
+        // Create console.ini if missing
+        $consoleIni = new Application_Update_ConsoleIni();
+        $consoleIni->run();
+
+        // Bootstrap again with console.ini containing admin credentials
+        $this->bootstrap();
+
+        // TODO do database update
+    }
+
+}
\ No newline at end of file
diff --git a/library/Application/Update/ConsoleIni.php b/library/Application/Update/ConsoleIni.php
new file mode 100644
index 000000000..c8c9502dd
--- /dev/null
+++ b/library/Application/Update/ConsoleIni.php
@@ -0,0 +1,171 @@
+<?php
+/*
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * Creates console.ini during update, if necessary.
+ *
+ * @category    Application
+ * @package     Application_Update
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+class Application_Update_ConsoleIni extends Application_Update_PluginAbstract
+{
+
+    const DEFAULT_ADMIN_USER = 'opus4admin';
+
+    const CONSOLE_INI_PATH = '/application/configs/console.ini';
+
+    const CONSOLE_INI_TEMPLATE_PATH = '/application/configs/console.ini.template';
+
+    const CREATEDB_SCRIPT_PATH = '/db/createdb.sh';
+
+    public function run() {
+        $this->log('Checking if console.ini exists ...');
+
+        $consoleIniPath = $this->getConsoleIniPath();
+
+        if (file_exists($consoleIniPath)) {
+            $this->log('console.ini found');
+            return;
+        }
+
+        $this->log('console.ini not found');
+        $this->log('Looking for admin credentials in ' . self::CREATEDB_SCRIPT_PATH);
+
+        // get credentials from createdb.sh
+        $createDbPath = $this->getCreateDbScriptPath();
+
+        $adminUser = null;
+        $adminPassword = null;
+
+        if (is_readable($createDbPath)) {
+            $shellScript = new Application_Util_ShellScript($createDbPath);
+
+            $adminUser = $shellScript->getProperty('user');
+            $adminPassword = $shellScript->getProperty('password');
+        }
+        else {
+            $this->log("Script '$createDbPath' not found");
+        }
+
+        // if necessary ask user to enter credentials
+        $adminUser = $this->readAdminUser($adminUser);
+        $adminPassword = $this->readAdminPassword($adminPassword);
+
+        // create console.ini
+        $properties = array(
+            '@db.admin.name@' => $adminUser,
+            '@db.admin.password@' => $adminPassword
+        );
+
+        $fileUtil = new Application_Util_File();
+        $fileUtil->copyAndFilter($this->getConsoleIniTemplatePath(), $consoleIniPath, $properties);
+
+        if (is_readable($consoleIniPath)) {
+            $this->log('console.ini created');
+        }
+    }
+
+    /**
+     * Returns path to console.ini file.
+     * @return string
+     */
+    public function getConsoleIniPath() {
+        return APPLICATION_PATH . self::CONSOLE_INI_PATH;
+    }
+
+    /**
+     * Returns path to createdb.sh file.
+     * @return string
+     */
+    public function getCreateDbScriptPath() {
+        return APPLICATION_PATH . self::CREATEDB_SCRIPT_PATH;
+    }
+
+    /**
+     * Returns path to console.ini.template file.
+     * @return string
+     */
+    public function getConsoleIniTemplatePath() {
+        return APPLICATION_PATH . self::CONSOLE_INI_TEMPLATE_PATH;
+    }
+
+    /**
+     * Queries admin user from console.
+     * @param $adminUser
+     * @return string
+     */
+    public function readAdminUser($adminUser)
+    {
+        if (is_null($adminUser) || strlen(trim($adminUser)) === 0)
+        {
+            $adminUser = self::DEFAULT_ADMIN_USER;
+            $input = readline("Please enter OPUS admin user name [$adminUser]: ");
+
+            if (!is_null($input) && strlen(trim($input)) > 0) {
+                $adminUser = $input;
+            }
+        }
+
+        return $adminUser;
+    }
+
+    /**
+     * Queries admin password from console.
+     * @param $adminPassword
+     * @return null|string
+     */
+    public function readAdminPassword($adminPassword)
+    {
+        if (is_null($adminPassword) || strlen(trim($adminPassword)) === 0)
+        {
+            $adminPassword = null;
+            $confirmPassword = null;
+
+            while (is_null($adminPassword) || $adminPassword !== $confirmPassword)
+            {
+                while (is_null($adminPassword) || strlen(trim($adminPassword)) === 0)
+                {
+                    $adminPassword = readline('Please enter OPUS admin password: ');
+                }
+
+                $confirmPassword = readline('Please enter OPUS admin password again: ');
+
+                if ($adminPassword !== $confirmPassword)
+                {
+                    $this->println('Passwords do not match.');
+                    $adminPassword = null;
+                }
+            }
+        }
+
+        return $adminPassword;
+    }
+
+}
diff --git a/library/Application/Update/PluginAbstract.php b/library/Application/Update/PluginAbstract.php
new file mode 100644
index 000000000..a0b1df54e
--- /dev/null
+++ b/library/Application/Update/PluginAbstract.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Application_Update
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/**
+ * Base class for update plugins.
+ */
+class Application_Update_PluginAbstract
+{
+
+    public function println($message)
+    {
+        echo $message . PHP_EOL;
+    }
+
+    public function log($message)
+    {
+        echo $message . PHP_EOL;
+    }
+
+}
\ No newline at end of file
diff --git a/scripts/update/update.php b/scripts/update/update.php
new file mode 100644
index 000000000..9fa44b6f8
--- /dev/null
+++ b/scripts/update/update.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the North Rhine-Westphalian Library Service Center,
+ * the Cooperative Library Network Berlin-Brandenburg, the Saarland University
+ * and State Library, the Saxon State Library - Dresden State and University
+ * Library, the Bielefeld University Library and the University Library of
+ * Hamburg University of Technology with funding from the German Research
+ * Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2009-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+/*
+ * Script for executing OPUS 4 update.
+ *
+ * For an update it is assumed that the relevant configuration files exist.
+ */
+
+set_include_path(
+    implode(
+        PATH_SEPARATOR, array(
+            dirname(dirname(dirname(__FILE__))) . '/library',
+            dirname(dirname(dirname(__FILE__))) . '/vendor',
+            get_include_path()
+        )
+    )
+);
+
+defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(dirname(dirname(__FILE__)))));
+
+defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
+
+require_once 'autoload.php';
+require_once 'opus-php-compatibility.php';
+
+$autoloader = Zend_Loader_Autoloader::getInstance();
+$autoloader->suppressNotFoundWarnings(false);
+$autoloader->setFallbackAutoloader(true);
+
+$update = new Application_Update();
+$update->bootstrap();
+$update->run();
\ No newline at end of file
diff --git a/tests/library/Application/Update/ConsoleIniTest.php b/tests/library/Application/Update/ConsoleIniTest.php
new file mode 100644
index 000000000..70d3ed160
--- /dev/null
+++ b/tests/library/Application/Update/ConsoleIniTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application Unit Test
+ * @package     Application_Update
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+class Application_Update_ConsoleIniTest extends ConstrollerTestCase
+{
+
+    public function testRun() {
+        $this->markTestIncomplete('Not clear how to test key input.');
+
+        // TODO modify target paths to work on test files
+        // TODO how to fake user interaction
+    }
+
+}

From e04a32a2b02342150bf1d8c6e4414183eba2060a Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 17 Nov 2016 11:09:48 +0100
Subject: [PATCH 096/115] OPUSVIER-3658 - Prepare tests workspace before test
 data import.

---
 bin/install-testdata.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bin/install-testdata.sh b/bin/install-testdata.sh
index 20187e17b..caccf741d 100755
--- a/bin/install-testdata.sh
+++ b/bin/install-testdata.sh
@@ -31,6 +31,18 @@ SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
 
 BASEDIR="`dirname "$SCRIPT_PATH"`"
 
+#
+# Prepare test workspace directories
+#
+
+mkdir -p "$BASEDIR/tests/workspace/files"
+mkdir -p "$BASEDIR/tests/workspace/incoming"
+mkdir -p "$BASEDIR/tests/workspace/log"
+mkdir -p "$BASEDIR/tests/workspace/cache"
+mkdir -p "$BASEDIR/tests/workspace/export"
+mkdir -p "$BASEDIR/tests/workspace/tmp"
+mkdir -p "$BASEDIR/tests/workspace/tmp/resumption"
+
 #
 # Import test data into database
 #

From ac62b78290453ff9a63d97c493671edc4a6d6a1f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 17 Nov 2016 14:38:23 +0100
Subject: [PATCH 097/115] OPUSVIER-3615 - Update plugin API extended.

---
 library/Application/Update/PluginAbstract.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/library/Application/Update/PluginAbstract.php b/library/Application/Update/PluginAbstract.php
index a0b1df54e..cf1bcc046 100644
--- a/library/Application/Update/PluginAbstract.php
+++ b/library/Application/Update/PluginAbstract.php
@@ -34,17 +34,33 @@
 /**
  * Base class for update plugins.
  */
-class Application_Update_PluginAbstract
+abstract class Application_Update_PluginAbstract
 {
 
+    /**
+     * Prints messages to console.
+     * @param $message
+     */
     public function println($message)
     {
         echo $message . PHP_EOL;
     }
 
+    /**
+     * Writes message to log.
+     * @param $message
+     *
+     * TODO log to file
+     */
     public function log($message)
     {
         echo $message . PHP_EOL;
     }
 
+    /**
+     * Performs update operation.
+     * @return mixed
+     */
+    abstract public function run();
+
 }
\ No newline at end of file

From 3fb20003037ad4e2ad50a03c137f7ecdfcd64b62 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 17 Nov 2016 17:25:06 +0100
Subject: [PATCH 098/115] OPUSVIER-3615 - Added database update to update
 script.

---
 library/Application/Update.php          |  6 ++-
 library/Application/Update/Database.php | 52 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 library/Application/Update/Database.php

diff --git a/library/Application/Update.php b/library/Application/Update.php
index 102a52c76..4e46075a7 100644
--- a/library/Application/Update.php
+++ b/library/Application/Update.php
@@ -64,6 +64,8 @@ public function bootstrap()
 
     /**
      * Perform update.
+     *
+     * TODO modify update steps dynamically based on versions involved
      */
     public function run()
     {
@@ -76,7 +78,9 @@ public function run()
         // Bootstrap again with console.ini containing admin credentials
         $this->bootstrap();
 
-        // TODO do database update
+        // Update database
+        $database = new Application_Update_Database();
+        $database->run();
     }
 
 }
\ No newline at end of file
diff --git a/library/Application/Update/Database.php b/library/Application/Update/Database.php
new file mode 100644
index 000000000..6a99f4318
--- /dev/null
+++ b/library/Application/Update/Database.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+ * the Saarland University and State Library, the Saxon State Library -
+ * Dresden State and University Library, the Bielefeld University Library and
+ * the University Library of Hamburg University of Technology with funding from
+ * the German Research Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @category    Application
+ * @package     Application_Update
+ * @author      Jens Schwidder <schwidder@zib.de>
+ * @copyright   Copyright (c) 2008-2016, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ *
+ * Updates database.
+ */
+class Application_Update_Database extends Application_Update_PluginAbstract
+{
+
+    /**
+     * Performs database update.
+     */
+    public function run()
+    {
+        $this->println('Updating database ...');
+
+        $database = new Opus_Database();
+
+        $database->update();
+
+        $this->println('Database update finished');
+    }
+
+}

From 958778278bff86e10d1dd55aac5d452497645fd6 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 23 Nov 2016 14:57:59 +0100
Subject: [PATCH 099/115] OPUSVIER-3615 - Initialize logging for update script.

---
 library/Application/Update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Application/Update.php b/library/Application/Update.php
index 4e46075a7..e882c2c7c 100644
--- a/library/Application/Update.php
+++ b/library/Application/Update.php
@@ -59,7 +59,7 @@ public function bootstrap()
 
         $application = new Zend_Application(APPLICATION_ENV, array("config"=>$configFiles));
 
-        $application->bootstrap('Configuration');
+        $application->bootstrap(array('Configuration', 'Logging'));
     }
 
     /**

From 1bb4d676ca5507c19d31b71f95d9566c9ae2d887 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 23 Nov 2016 14:58:46 +0100
Subject: [PATCH 100/115] OPUSVIER-3549 - Changed OPUS dependencies to released
 versions.

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c7d6c8cda..59cf83295 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
     "zendframework/zendframework1": "1.12.18",
     "jpgraph/jpgraph": "dev-master",
     "solarium/solarium": "3.4.1",
-    "opus4-repo/framework": "dev-master",
-    "opus4-repo/search": "4.5.0-RC1",
+    "opus4-repo/framework": "4.5",
+    "opus4-repo/search": "4.5",
     "components/jquery": "1.12.4",
     "components/jqueryui": "1.12.1",
     "robloach/component-installer": "*"

From d22f62bb5fb3d4ef3eb0df9a84d5e2310a620e4b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 23 Nov 2016 16:13:04 +0100
Subject: [PATCH 101/115] OPUSVIER-3549 - composer.lock committed, so all
 installations use same dependencies.

---
 composer.lock | 4889 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4889 insertions(+)
 create mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..247c086ea
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,4889 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "12a4776479615501a70ae8f7087a7d39",
+    "content-hash": "8e226b4371da35ac8b89e8d39cb8416d",
+    "packages": [
+        {
+            "name": "components/jquery",
+            "version": "1.12.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/components/jquery.git",
+                "reference": "5dd7297d7603e11e53bdcca2a71074d92de37b8f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/components/jquery/zipball/5dd7297d7603e11e53bdcca2a71074d92de37b8f",
+                "reference": "5dd7297d7603e11e53bdcca2a71074d92de37b8f",
+                "shasum": ""
+            },
+            "type": "component",
+            "extra": {
+                "component": {
+                    "scripts": [
+                        "jquery.js"
+                    ],
+                    "files": [
+                        "jquery.min.js",
+                        "jquery.min.map",
+                        "jquery-migrate.js",
+                        "jquery-migrate.min.js"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Resig",
+                    "email": "jeresig@gmail.com"
+                }
+            ],
+            "description": "jQuery JavaScript Library",
+            "homepage": "http://jquery.com",
+            "time": "2016-05-25 06:50:04"
+        },
+        {
+            "name": "components/jqueryui",
+            "version": "1.12.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/components/jqueryui.git",
+                "reference": "44ecf3794cc56b65954cc19737234a3119d036cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/components/jqueryui/zipball/44ecf3794cc56b65954cc19737234a3119d036cc",
+                "reference": "44ecf3794cc56b65954cc19737234a3119d036cc",
+                "shasum": ""
+            },
+            "require": {
+                "components/jquery": ">=1.6"
+            },
+            "type": "component",
+            "extra": {
+                "component": {
+                    "name": "jquery-ui",
+                    "scripts": [
+                        "jquery-ui.js"
+                    ],
+                    "files": [
+                        "ui/**",
+                        "themes/**",
+                        "jquery-ui.min.js"
+                    ],
+                    "shim": {
+                        "deps": [
+                            "jquery"
+                        ],
+                        "exports": "jQuery"
+                    }
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "jQuery UI Team",
+                    "homepage": "http://jqueryui.com/about"
+                },
+                {
+                    "name": "Joern Zaefferer",
+                    "email": "joern.zaefferer@gmail.com",
+                    "homepage": "http://bassistance.de"
+                },
+                {
+                    "name": "Scott Gonzalez",
+                    "email": "scott.gonzalez@gmail.com",
+                    "homepage": "http://scottgonzalez.com"
+                },
+                {
+                    "name": "Kris Borchers",
+                    "email": "kris.borchers@gmail.com",
+                    "homepage": "http://krisborchers.com"
+                },
+                {
+                    "name": "Mike Sherov",
+                    "email": "mike.sherov@gmail.com",
+                    "homepage": "http://mike.sherov.com"
+                },
+                {
+                    "name": "TJ VanToll",
+                    "email": "tj.vantoll@gmail.com",
+                    "homepage": "http://tjvantoll.com"
+                },
+                {
+                    "name": "Corey Frang",
+                    "email": "gnarf37@gmail.com",
+                    "homepage": "http://gnarf.net"
+                },
+                {
+                    "name": "Felix Nagel",
+                    "email": "info@felixnagel.com",
+                    "homepage": "http://www.felixnagel.com"
+                }
+            ],
+            "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
+            "time": "2016-09-16 05:47:55"
+        },
+        {
+            "name": "jpgraph/jpgraph",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ztec/JpGraph.git",
+                "reference": "ad26df5941e847cf1255aecd2011ce16207304cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ztec/JpGraph/zipball/ad26df5941e847cf1255aecd2011ce16207304cf",
+                "reference": "ad26df5941e847cf1255aecd2011ce16207304cf",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JpGraph": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "QPL 1.0"
+            ],
+            "authors": [
+                {
+                    "name": "JpGraph team"
+                }
+            ],
+            "description": "jpGraph, library to make graphs and charts",
+            "homepage": "http://jpgraph.net/",
+            "keywords": [
+                "chart",
+                "data",
+                "graph",
+                "jpgraph",
+                "pie"
+            ],
+            "time": "2013-05-23 14:04:00"
+        },
+        {
+            "name": "kriswallsmith/assetic",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kriswallsmith/assetic.git",
+                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
+                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/process": "~2.1|~3.0"
+            },
+            "conflict": {
+                "twig/twig": "<1.27"
+            },
+            "require-dev": {
+                "leafo/lessphp": "^0.3.7",
+                "leafo/scssphp": "~0.1",
+                "meenie/javascript-packer": "^1.1",
+                "mrclay/minify": "<2.3",
+                "natxet/cssmin": "3.0.4",
+                "patchwork/jsqueeze": "~1.0|~2.0",
+                "phpunit/phpunit": "~4.8 || ^5.6",
+                "psr/log": "~1.0",
+                "ptachoire/cssembed": "~1.0",
+                "symfony/phpunit-bridge": "~2.7|~3.0",
+                "twig/twig": "~1.23|~2.0",
+                "yfix/packager": "dev-master"
+            },
+            "suggest": {
+                "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
+                "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
+                "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
+                "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor",
+                "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
+                "twig/twig": "Assetic provides the integration with the Twig templating engine"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Assetic": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kris Wallsmith",
+                    "email": "kris.wallsmith@gmail.com",
+                    "homepage": "http://kriswallsmith.net/"
+                }
+            ],
+            "description": "Asset Management for PHP",
+            "homepage": "https://github.com/kriswallsmith/assetic",
+            "keywords": [
+                "assets",
+                "compression",
+                "minification"
+            ],
+            "time": "2016-11-11 18:43:20"
+        },
+        {
+            "name": "opus4-repo/framework",
+            "version": "4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/OPUS4/framework.git",
+                "reference": "3a8273781df35109a10f840ecda7d99e8eca0c36"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/OPUS4/framework/zipball/3a8273781df35109a10f840ecda7d99e8eca0c36",
+                "reference": "3a8273781df35109a10f840ecda7d99e8eca0c36",
+                "shasum": ""
+            },
+            "require": {
+                "solarium/solarium": ">=3.4.1",
+                "zendframework/zendframework1": ">=1.12.15"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "1.0.5",
+                "mayflower/php-codebrowser": "~1.1",
+                "opus4-repo/codesniffer": "dev-master",
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phploc/phploc": "*",
+                "phpmd/phpmd": "2.4.3",
+                "phpunit/dbunit": "1.4.*",
+                "phpunit/php-invoker": "1.1.*",
+                "phpunit/phpunit": "4.8.5",
+                "phpunit/phpunit-selenium": "1.4.2",
+                "phpunit/phpunit-story": "1.0.*",
+                "sebastian/phpcpd": "*",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "bin": [
+                "db/createdb.sh"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Opus_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Framework for Opus 4",
+            "homepage": "http://opus4.kobv.de",
+            "keywords": [
+                "framework",
+                "opus4"
+            ],
+            "time": "2016-11-23 13:19:44"
+        },
+        {
+            "name": "opus4-repo/search",
+            "version": "4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/OPUS4/search.git",
+                "reference": "426ddd4890585a3e53bbcfadc5a0f019f12c4dc4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/OPUS4/search/zipball/426ddd4890585a3e53bbcfadc5a0f019f12c4dc4",
+                "reference": "426ddd4890585a3e53bbcfadc5a0f019f12c4dc4",
+                "shasum": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.6-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Solr configuration for Opus 4",
+            "homepage": "http://opus4.kobv.de",
+            "keywords": [
+                "opus4",
+                "solr"
+            ],
+            "time": "2016-11-23 13:53:12"
+        },
+        {
+            "name": "robloach/component-installer",
+            "version": "0.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/RobLoach/component-installer.git",
+                "reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/RobLoach/component-installer/zipball/908a859aa7c4949ba9ad67091e67bac10b66d3d7",
+                "reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "kriswallsmith/assetic": "1.*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "composer/composer": "1.*@alpha",
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                },
+                "class": "ComponentInstaller\\ComponentInstallerPlugin"
+            },
+            "autoload": {
+                "psr-0": {
+                    "ComponentInstaller": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Rob Loach",
+                    "homepage": "http://robloach.net"
+                }
+            ],
+            "description": "Allows installation of Components via Composer.",
+            "time": "2015-08-10 12:35:38"
+        },
+        {
+            "name": "solarium/solarium",
+            "version": "3.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/solariumphp/solarium.git",
+                "reference": "90d006c65efffcbcbfa8a31920e93c10d0657b96"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/90d006c65efffcbcbfa8a31920e93c10d0657b96",
+                "reference": "90d006c65efffcbcbfa8a31920e93c10d0657b96",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7",
+                "satooshi/php-coveralls": "~0.6",
+                "squizlabs/php_codesniffer": "~1.4",
+                "zendframework/zendframework1": "~1.12"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "3.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Solarium\\": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "NewBSD"
+            ],
+            "authors": [
+                {
+                    "name": "See GitHub contributors",
+                    "homepage": "https://github.com/basdenooijer/solarium/contributors"
+                }
+            ],
+            "description": "PHP Solr client",
+            "homepage": "http://www.solarium-project.org",
+            "keywords": [
+                "php",
+                "search",
+                "solr"
+            ],
+            "time": "2015-06-14 17:22:39"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
+                "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-10-13 01:43:15"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
+                "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-09-29 14:03:54"
+        },
+        {
+            "name": "zendframework/zendframework1",
+            "version": "1.12.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zf1.git",
+                "reference": "bc3f2652f305fc43565af1570db83dda05578e4f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zf1/zipball/bc3f2652f305fc43565af1570db83dda05578e4f",
+                "reference": "bc3f2652f305fc43565af1570db83dda05578e4f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.11"
+            },
+            "require-dev": {
+                "phpunit/dbunit": "1.3.*",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework 1",
+            "homepage": "http://framework.zend.com/",
+            "keywords": [
+                "ZF1",
+                "framework"
+            ],
+            "time": "2016-04-13 15:32:30"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "cilex/cilex",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Cilex/Cilex.git",
+                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Cilex/Cilex/zipball/7acd965a609a56d0345e8b6071c261fbdb926cb5",
+                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5",
+                "shasum": ""
+            },
+            "require": {
+                "cilex/console-service-provider": "1.*",
+                "php": ">=5.3.3",
+                "pimple/pimple": "~1.0",
+                "symfony/finder": "~2.1",
+                "symfony/process": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "symfony/validator": "~2.1"
+            },
+            "suggest": {
+                "monolog/monolog": ">=1.0.0",
+                "symfony/validator": ">=1.0.0",
+                "symfony/yaml": ">=1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Cilex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "description": "The PHP micro-framework for Command line tools based on the Symfony2 Components",
+            "homepage": "http://cilex.github.com",
+            "keywords": [
+                "cli",
+                "microframework"
+            ],
+            "time": "2014-03-29 14:03:13"
+        },
+        {
+            "name": "cilex/console-service-provider",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Cilex/console-service-provider.git",
+                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Cilex/console-service-provider/zipball/25ee3d1875243d38e1a3448ff94bdf944f70d24e",
+                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "pimple/pimple": "1.*@dev",
+                "symfony/console": "~2.1"
+            },
+            "require-dev": {
+                "cilex/cilex": "1.*@dev",
+                "silex/silex": "1.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Cilex\\Provider\\Console": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "description": "Console Service Provider",
+            "keywords": [
+                "cilex",
+                "console",
+                "pimple",
+                "service-provider",
+                "silex"
+            ],
+            "time": "2012-12-19 10:50:58"
+        },
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "time": "2014-12-30 15:22:37"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/30e07cf03edc3cd3ef579d0dd4dd8c58250799a5",
+                "reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "^5.6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2016-10-24 11:45:47"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09 13:34:57"
+        },
+        {
+            "name": "erusev/parsedown",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Parsedown": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Emanuil Rusev",
+                    "email": "hello@erusev.com",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "time": "2016-11-02 15:56:58"
+        },
+        {
+            "name": "herrera-io/json",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-abandoned/php-json.git",
+                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-abandoned/php-json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1",
+                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "justinrainbow/json-schema": ">=1.0,<2.0-dev",
+                "php": ">=5.3.3",
+                "seld/jsonlint": ">=1.0,<2.0-dev"
+            },
+            "require-dev": {
+                "herrera-io/phpunit-test-case": "1.*",
+                "mikey179/vfsstream": "1.1.0",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/lib/json_version.php"
+                ],
+                "psr-0": {
+                    "Herrera\\Json": "src/lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "kevin@herrera.io",
+                    "homepage": "http://kevin.herrera.io"
+                }
+            ],
+            "description": "A library for simplifying JSON linting and validation.",
+            "homepage": "http://herrera-io.github.com/php-json",
+            "keywords": [
+                "json",
+                "lint",
+                "schema",
+                "validate"
+            ],
+            "time": "2013-10-30 16:51:34"
+        },
+        {
+            "name": "herrera-io/phar-update",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-abandoned/php-phar-update.git",
+                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-abandoned/php-phar-update/zipball/00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
+                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
+                "shasum": ""
+            },
+            "require": {
+                "herrera-io/json": "1.*",
+                "kherge/version": "1.*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "herrera-io/phpunit-test-case": "1.*",
+                "mikey179/vfsstream": "1.1.0",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/lib/constants.php"
+                ],
+                "psr-0": {
+                    "Herrera\\Phar\\Update": "src/lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "kevin@herrera.io",
+                    "homepage": "http://kevin.herrera.io"
+                }
+            ],
+            "description": "A library for self-updating Phars.",
+            "homepage": "http://herrera-io.github.com/php-phar-update",
+            "keywords": [
+                "phar",
+                "update"
+            ],
+            "time": "2013-10-30 17:23:01"
+        },
+        {
+            "name": "jms/metadata",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/metadata.git",
+                "reference": "22b72455559a25777cfd28c4ffda81ff7639f353"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353",
+                "reference": "22b72455559a25777cfd28c4ffda81ff7639f353",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Metadata\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "https://github.com/schmittjoh",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Class/method/property metadata management in PHP",
+            "keywords": [
+                "annotations",
+                "metadata",
+                "xml",
+                "yaml"
+            ],
+            "time": "2014-07-12 07:13:19"
+        },
+        {
+            "name": "jms/parser-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/parser-lib.git",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": ">=0.9,<2.0-dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "description": "A library for easily creating recursive-descent parsers.",
+            "time": "2012-11-18 18:08:43"
+        },
+        {
+            "name": "jms/serializer",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/serializer.git",
+                "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/f39d8b4660d5cef43b0c3265ce642173d9b2c58b",
+                "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.0",
+                "doctrine/instantiator": "^1.0.3",
+                "jms/metadata": "~1.1",
+                "jms/parser-lib": "1.*",
+                "php": ">=5.5.0",
+                "phpcollection/phpcollection": "~0.1",
+                "phpoption/phpoption": "^1.1"
+            },
+            "conflict": {
+                "twig/twig": "<1.12"
+            },
+            "require-dev": {
+                "doctrine/orm": "~2.1",
+                "doctrine/phpcr-odm": "^1.3|^2.0",
+                "ext-pdo_sqlite": "*",
+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+                "phpunit/phpunit": "^4.8|^5.0",
+                "propel/propel1": "~1.7",
+                "symfony/filesystem": "^2.1",
+                "symfony/form": "~2.1",
+                "symfony/translation": "^2.1",
+                "symfony/validator": "^2.2",
+                "symfony/yaml": "^2.1",
+                "twig/twig": "~1.12|~2.0"
+            },
+            "suggest": {
+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\Serializer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
+            "homepage": "http://jmsyst.com/libs/serializer",
+            "keywords": [
+                "deserialization",
+                "jaxb",
+                "json",
+                "serialization",
+                "xml"
+            ],
+            "time": "2016-11-13 10:20:11"
+        },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/cc84765fb7317f6b07bd8ac78364747f95b86341",
+                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.29"
+            },
+            "require-dev": {
+                "json-schema/json-schema-test-suite": "1.1.0",
+                "phpdocumentor/phpdocumentor": "~2",
+                "phpunit/phpunit": "~3.7"
+            },
+            "bin": [
+                "bin/validate-json"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JsonSchema\\": "src/JsonSchema/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2016-01-25 15:43:01"
+        },
+        {
+            "name": "kherge/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-abandoned/Version.git",
+                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-abandoned/Version/zipball/f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
+                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "KevinGH\\Version": "src/lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "me@kevingh.com"
+                }
+            ],
+            "description": "A parsing and comparison library for semantic versioning.",
+            "homepage": "http://github.com/kherge/Version",
+            "time": "2012-08-16 17:13:03"
+        },
+        {
+            "name": "mayflower/php-codebrowser",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mayflower/PHP_CodeBrowser.git",
+                "reference": "b44cb1867211b3eb9efe8bb61a57fe782c84831f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mayflower/PHP_CodeBrowser/zipball/b44cb1867211b3eb9efe8bb61a57fe782c84831f",
+                "reference": "b44cb1867211b3eb9efe8bb61a57fe782c84831f",
+                "shasum": ""
+            },
+            "require": {
+                "monolog/monolog": "~1.7",
+                "phpunit/php-file-iterator": "~1.3",
+                "symfony/console": "~2.1|~3.0"
+            },
+            "require-dev": {
+                "phploc/phploc": "*",
+                "phpmd/phpmd": "1.5.*",
+                "phpunit/phpunit": "3.7.*",
+                "sebastian/phpcpd": "*",
+                "squizlabs/php_codesniffer": "1.*"
+            },
+            "bin": [
+                "bin/phpcb"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPCodeBrowser\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Robin Gloster",
+                    "email": "robin.gloster@mayflower.de",
+                    "role": "developer"
+                }
+            ],
+            "description": "A code browser that augments the code with information from various QA tools.",
+            "homepage": "https://github.com/Mayflower/PHP_CodeBrowser",
+            "time": "2016-01-14 12:43:42"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.21.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/log": "~1.0"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^2.4.9",
+                "doctrine/couchdb": "~1.0@dev",
+                "graylog2/gelf-php": "~1.0",
+                "jakub-onderka/php-parallel-lint": "0.9",
+                "php-amqplib/php-amqplib": "~2.4",
+                "php-console/php-console": "^3.1.3",
+                "phpunit/phpunit": "~4.5",
+                "phpunit/phpunit-mock-objects": "2.3.0",
+                "ruflin/elastica": ">=0.90 <3.0",
+                "sentry/sentry": "^0.13",
+                "swiftmailer/swiftmailer": "~5.3"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-mongo": "Allow sending log messages to a MongoDB server",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "php-console/php-console": "Allow sending log messages to Google Chrome",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "sentry/sentry": "Allow sending log messages to a Sentry server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "http://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "time": "2016-07-29 03:23:52"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
+                "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2015-09-19 14:15:08"
+        },
+        {
+            "name": "opus4-repo/codesniffer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/OPUS4/codesniffer.git",
+                "reference": "e6e9ed0521d30c641e61952853e3083f40d024cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/OPUS4/codesniffer/zipball/e6e9ed0521d30c641e61952853e3083f40d024cb",
+                "reference": "e6e9ed0521d30c641e61952853e3083f40d024cb",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Coding style for OPUS 4",
+            "homepage": "http://opus4.kobv.de",
+            "keywords": [
+                "codesniffer",
+                "opus4",
+                "php"
+            ],
+            "time": "2015-08-06 12:13:11"
+        },
+        {
+            "name": "pdepend/pdepend",
+            "version": "2.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pdepend/pdepend.git",
+                "reference": "132c0a58dae0a92c4e091857515f4afcd5d27413"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/132c0a58dae0a92c4e091857515f4afcd5d27413",
+                "reference": "132c0a58dae0a92c4e091857515f4afcd5d27413",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.7",
+                "symfony/config": "^2.3.0|^3",
+                "symfony/dependency-injection": "^2.3.0|^3",
+                "symfony/filesystem": "^2.3.0|^3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.4.0,<4.8",
+                "squizlabs/php_codesniffer": "^2.0.0"
+            },
+            "bin": [
+                "src/bin/pdepend"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PDepend\\": "src/main/php/PDepend"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Official version of pdepend to be handled with Composer",
+            "time": "2016-11-23 12:21:10"
+        },
+        {
+            "name": "phpcollection/phpcollection",
+            "version": "0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-collection.git",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpCollection": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "General-Purpose Collection Library for PHP",
+            "keywords": [
+                "collection",
+                "list",
+                "map",
+                "sequence",
+                "set"
+            ],
+            "time": "2015-05-17 12:39:23"
+        },
+        {
+            "name": "phpdocumentor/fileset",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/Fileset.git",
+                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/Fileset/zipball/bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
+                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/finder": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Fileset component for collecting a set of files given directories and file paths",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "files",
+                "fileset",
+                "phpdoc"
+            ],
+            "time": "2013-08-06 21:07:42"
+        },
+        {
+            "name": "phpdocumentor/graphviz",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/GraphViz.git",
+                "reference": "a906a90a9f230535f25ea31caf81b2323956283f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/GraphViz/zipball/a906a90a9f230535f25ea31caf81b2323956283f",
+                "reference": "a906a90a9f230535f25ea31caf81b2323956283f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2016-02-02 13:00:08"
+        },
+        {
+            "name": "phpdocumentor/phpdocumentor",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/phpDocumentor2.git",
+                "reference": "be607da0eef9b9249c43c5b4820d25d631c73667"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/be607da0eef9b9249c43c5b4820d25d631c73667",
+                "reference": "be607da0eef9b9249c43c5b4820d25d631c73667",
+                "shasum": ""
+            },
+            "require": {
+                "cilex/cilex": "~1.0",
+                "erusev/parsedown": "~1.0",
+                "herrera-io/phar-update": "1.0.3",
+                "jms/serializer": ">=0.12",
+                "monolog/monolog": "~1.6",
+                "php": ">=5.3.3",
+                "phpdocumentor/fileset": "~1.0",
+                "phpdocumentor/graphviz": "~1.0",
+                "phpdocumentor/reflection": "^3.0",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "symfony/config": "~2.3",
+                "symfony/console": "~2.3",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.0",
+                "symfony/stopwatch": "~2.3",
+                "symfony/validator": "~2.2",
+                "twig/twig": "~1.3",
+                "zendframework/zend-cache": "~2.1",
+                "zendframework/zend-config": "~2.1",
+                "zendframework/zend-filter": "~2.1",
+                "zendframework/zend-i18n": "~2.1",
+                "zendframework/zend-serializer": "~2.1",
+                "zendframework/zend-servicemanager": "~2.1",
+                "zendframework/zend-stdlib": "~2.1",
+                "zetacomponents/document": ">=1.3.1"
+            },
+            "require-dev": {
+                "behat/behat": "~3.0",
+                "mikey179/vfsstream": "~1.2",
+                "mockery/mockery": "~0.9@dev",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.4",
+                "symfony/expression-language": "~2.4"
+            },
+            "suggest": {
+                "ext-twig": "Enabling the twig extension improves the generation of twig based templates.",
+                "ext-xslcache": "Enabling the XSLCache extension improves the generation of xml based templates."
+            },
+            "bin": [
+                "bin/phpdoc.php",
+                "bin/phpdoc"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/"
+                    ],
+                    "Cilex\\Provider": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Documentation Generator for PHP",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "api",
+                "application",
+                "dga",
+                "documentation",
+                "phpdoc"
+            ],
+            "time": "2016-05-22 09:50:56"
+        },
+        {
+            "name": "phpdocumentor/reflection",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/Reflection.git",
+                "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d",
+                "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^1.0",
+                "php": ">=5.3.3",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "psr/log": "~1.0"
+            },
+            "require-dev": {
+                "behat/behat": "~2.4",
+                "mockery/mockery": "~0.8",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/",
+                        "tests/mocks/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Reflection library to do Static Analysis for PHP Projects",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2016-05-21 08:42:32"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phploc/phploc",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phploc.git",
+                "reference": "74f917e6f80f291856989960d31afa44a4196859"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/74f917e6f80f291856989960d31afa44a4196859",
+                "reference": "74f917e6f80f291856989960d31afa44a4196859",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/finder-facade": "~1.1",
+                "sebastian/git": "~2.1",
+                "sebastian/version": "~1.0.3|~2.0",
+                "symfony/console": "~2.5|~3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "bin": [
+                "phploc"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "A tool for quickly measuring the size of a PHP project.",
+            "homepage": "https://github.com/sebastianbergmann/phploc",
+            "time": "2016-04-25 08:11:21"
+        },
+        {
+            "name": "phpmd/phpmd",
+            "version": "2.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmd/phpmd.git",
+                "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/2b9c2417a18696dfb578b38c116cd0ddc19b256e",
+                "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e",
+                "shasum": ""
+            },
+            "require": {
+                "pdepend/pdepend": "^2.0.4",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0",
+                "squizlabs/php_codesniffer": "^2.0"
+            },
+            "bin": [
+                "src/bin/phpmd"
+            ],
+            "type": "project",
+            "autoload": {
+                "psr-0": {
+                    "PHPMD\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Manuel Pichler",
+                    "email": "github@manuel-pichler.de",
+                    "homepage": "https://github.com/manuelpichler",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Other contributors",
+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
+                    "role": "Contributors"
+                },
+                {
+                    "name": "Marc Würth",
+                    "email": "ravage@bluewin.ch",
+                    "homepage": "https://github.com/ravage84",
+                    "role": "Project Maintainer"
+                }
+            ],
+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
+            "homepage": "http://phpmd.org/",
+            "keywords": [
+                "mess detection",
+                "mess detector",
+                "pdepend",
+                "phpmd",
+                "pmd"
+            ],
+            "time": "2016-04-04 11:52:04"
+        },
+        {
+            "name": "phpoption/phpoption",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpOption\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "time": "2015-07-25 16:39:46"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
+                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0|^2.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.0",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-11-21 14:58:47"
+        },
+        {
+            "name": "phpunit/dbunit",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/dbunit.git",
+                "reference": "9aaee6447663ff1b0cd50c23637e04af74c5e2ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/9aaee6447663ff1b0cd50c23637e04af74c5e2ae",
+                "reference": "9aaee6447663ff1b0cd50c23637e04af74c5e2ae",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pdo": "*",
+                "ext-simplexml": "*",
+                "php": ">=5.3.3",
+                "phpunit/phpunit": "~4|~5",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "bin": [
+                "composer/bin/dbunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "DbUnit port for PHP/PHPUnit to support database interaction testing.",
+            "homepage": "https://github.com/sebastianbergmann/dbunit/",
+            "keywords": [
+                "database",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-08-07 04:57:38"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06 15:47:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "86074bf0fc2caf02ec8819a93f65a37cd0b44c8e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/86074bf0fc2caf02ec8819a93f65a37cd0b44c8e",
+                "reference": "86074bf0fc2caf02ec8819a93f65a37cd0b44c8e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcntl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-timer": ">=1.0.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for invoking callables with a timeout.",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "time": "2015-06-21 13:32:55"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2016-05-12 18:03:57"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2016-11-15 14:06:22"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.24",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-03-14 06:16:08"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02 06:51:40"
+        },
+        {
+            "name": "phpunit/phpunit-selenium",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/giorgiosironi/phpunit-selenium.git",
+                "reference": "c84dd7ca214563868ce216123b7ae9c792beb262"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/c84dd7ca214563868ce216123b7ae9c792beb262",
+                "reference": "c84dd7ca214563868ce216123b7ae9c792beb262",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "php": ">=5.3.3",
+                "phpunit/phpunit": "~3.7|~4.0",
+                "sebastian/comparator": "~1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                },
+                {
+                    "name": "Giorgio Sironi",
+                    "email": "info@giorgiosironi.com",
+                    "role": "developer"
+                }
+            ],
+            "description": "Selenium Server integration for PHPUnit",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "selenium",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-11-02 09:23:27"
+        },
+        {
+            "name": "phpunit/phpunit-story",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpunit/phpunit-story.git",
+                "reference": "b8579ada6ede4fd2f4b49e8549a8a176606cae68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpunit/phpunit-story/zipball/b8579ada6ede4fd2f4b49e8549a8a176606cae68",
+                "reference": "b8579ada6ede4fd2f4b49e8549a8a176606cae68",
+                "shasum": ""
+            },
+            "require": {
+                "ext-spl": "*",
+                "php": ">=5.2.7",
+                "phpunit/phpunit": ">=3.6.0RC1@stable"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Story extension for PHPUnit to facilitate Behaviour-Driven Development.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "xunit"
+            ],
+            "abandoned": "behat/behat",
+            "time": "2013-04-02 16:07:28"
+        },
+        {
+            "name": "pimple/pimple",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2013-11-22 08:30:29"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10 12:19:37"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
+                "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2016-11-19 09:18:40"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18 05:49:44"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17 09:04:28"
+        },
+        {
+            "name": "sebastian/finder-facade",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
+                "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9",
+                "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9",
+                "shasum": ""
+            },
+            "require": {
+                "symfony/finder": "~2.3|~3.0",
+                "theseer/fdomdocument": "~1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "time": "2016-02-17 07:02:23"
+        },
+        {
+            "name": "sebastian/git",
+            "version": "2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/git.git",
+                "reference": "5100bc50cd9e70f424c643618e142214225024f3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/5100bc50cd9e70f424c643618e142214225024f3",
+                "reference": "5100bc50cd9e70f424c643618e142214225024f3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Simple wrapper for Git",
+            "homepage": "http://www.github.com/sebastianbergmann/git",
+            "keywords": [
+                "git"
+            ],
+            "time": "2016-06-15 09:30:19"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/phpcpd",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
+                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db",
+                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-timer": ">=1.0.6",
+                "sebastian/finder-facade": "~1.1",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/console": "~2.7|^3.0",
+                "theseer/fdomdocument": "~1.4"
+            },
+            "bin": [
+                "phpcpd"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Copy/Paste Detector (CPD) for PHP code.",
+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "time": "2016-04-17 19:32:49"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-11-11 19:50:13"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "19495c181d6d53a0a13414154e52817e3b504189"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/19495c181d6d53a0a13414154e52817e3b504189",
+                "reference": "19495c181d6d53a0a13414154e52817e3b504189",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "time": "2016-11-14 17:59:58"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
+                "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2016-09-01 23:53:02"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/1361bc4e66f97b6202ae83f4190e962c624b5e61",
+                "reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/filesystem": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-03 07:52:58"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a871ba00e0f604dceac64c56c27f99fbeaf4854e",
+                "reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/debug": "~2.7,>=2.7.2|~3.0.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-15 23:02:12"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v3.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/class-loader": "~2.8|~3.0",
+                "symfony/http-kernel": "~2.8|~3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-07-30 07:22:48"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v3.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "87598e21bb9020bd9ccd6df6936b9c369c72775d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/87598e21bb9020bd9ccd6df6936b9c369c72775d",
+                "reference": "87598e21bb9020bd9ccd6df6936b9c369c72775d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/config": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/yaml": "~2.8.7|~3.0.7|~3.1.1|~3.2"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DependencyInjection Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-18 21:15:08"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v3.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "b2da5009d9bacbd91d83486aa1f44c793a8c380d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b2da5009d9bacbd91d83486aa1f44c793a8c380d",
+                "reference": "b2da5009d9bacbd91d83486aa1f44c793a8c380d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-07-20 05:43:46"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/0023b024363dfc0cd21262e556f25a291fe8d7fd",
+                "reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-03 07:52:58"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14 01:06:16"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "35bae476693150728b0eb51647faac82faf9aaca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/35bae476693150728b0eb51647faac82faf9aaca",
+                "reference": "35bae476693150728b0eb51647faac82faf9aaca",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Stopwatch Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-06-29 05:29:29"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v3.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26",
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/config": "<2.8"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/intl": "~2.8|~3.0",
+                "symfony/yaml": "~2.8|~3.0"
+            },
+            "suggest": {
+                "psr/log": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-07-30 07:22:48"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "c4ef882117461a4151064ad16c5d638dd1c70b9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/c4ef882117461a4151064ad16c5d638dd1c70b9e",
+                "reference": "c4ef882117461a4151064ad16c5d638dd1c70b9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/translation": "~2.4|~3.0.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
+                "egulias/email-validator": "~1.2,>=1.2.1",
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/intl": "~2.7.4|~2.8|~3.0.0",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the 2.4 Expression validator",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For using the 2.4 Validator API",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Validator Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-18 21:10:01"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "9da375317228e54f4ea1b013b30fa47417e84943"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/9da375317228e54f4ea1b013b30fa47417e84943",
+                "reference": "9da375317228e54f4ea1b013b30fa47417e84943",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-18 21:05:29"
+        },
+        {
+            "name": "theseer/fdomdocument",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/fDOMDocument.git",
+                "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d9ad139d6c2e8edf5e313ffbe37ff13344cf0684",
+                "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "lib-libxml": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
+            "homepage": "https://github.com/theseer/fDOMDocument",
+            "time": "2015-05-27 22:58:02"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.28.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "fff80c4a7ae1d47a81dfec10c76cbcb939170b45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/fff80c4a7ae1d47a81dfec10c76cbcb939170b45",
+                "reference": "fff80c4a7ae1d47a81dfec10c76cbcb939170b45",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.7"
+            },
+            "require-dev": {
+                "symfony/debug": "~2.7",
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.28-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2016-11-19 05:52:49"
+        },
+        {
+            "name": "zendframework/zend-cache",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-cache.git",
+                "reference": "2c68def8f96ce842d2f2a9a69e2f3508c2f5312d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/2c68def8f96ce842d2f2a9a69e2f3508c2f5312d",
+                "reference": "2c68def8f96ce842d2f2a9a69e2f3508c2f5312d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpbench/phpbench": "^0.10.0",
+                "phpunit/phpunit": "^4.5",
+                "zendframework/zend-serializer": "^2.6",
+                "zendframework/zend-session": "^2.6.2"
+            },
+            "suggest": {
+                "ext-apc": "APC or compatible extension, to use the APC storage adapter",
+                "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
+                "ext-dba": "DBA, to use the DBA storage adapter",
+                "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
+                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
+                "ext-mongo": "Mongo, to use MongoDb storage adapter",
+                "ext-redis": "Redis, to use Redis storage adapter",
+                "ext-wincache": "WinCache, to use the WinCache storage adapter",
+                "ext-xcache": "XCache, to use the XCache storage adapter",
+                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Cache",
+                    "config-provider": "Zend\\Cache\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a generic way to cache any data",
+            "homepage": "https://github.com/zendframework/zend-cache",
+            "keywords": [
+                "cache",
+                "zf2"
+            ],
+            "time": "2016-05-12 21:47:55"
+        },
+        {
+            "name": "zendframework/zend-config",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-config.git",
+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-i18n": "^2.5",
+                "zendframework/zend-json": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Config\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "homepage": "https://github.com/zendframework/zend-config",
+            "keywords": [
+                "config",
+                "zf2"
+            ],
+            "time": "2016-02-04 23:01:10"
+        },
+        {
+            "name": "zendframework/zend-eventmanager",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-eventmanager.git",
+                "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e",
+                "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "^0.1",
+                "container-interop/container-interop": "^1.1.0",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.0",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
+            },
+            "suggest": {
+                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\EventManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Trigger and listen to events within a PHP application",
+            "homepage": "https://github.com/zendframework/zend-eventmanager",
+            "keywords": [
+                "event",
+                "eventmanager",
+                "events",
+                "zf2"
+            ],
+            "time": "2016-02-18 20:53:00"
+        },
+        {
+            "name": "zendframework/zend-filter",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-filter.git",
+                "reference": "84c50246428efb0a1e52868e162dab3e149d5b80"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/84c50246428efb0a1e52868e162dab3e149d5b80",
+                "reference": "84c50246428efb0a1e52868e162dab3e149d5b80",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "pear/archive_tar": "^1.4",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-crypt": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-uri": "^2.5"
+            },
+            "suggest": {
+                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
+                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
+                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Filter",
+                    "config-provider": "Zend\\Filter\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Filter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a set of commonly needed data filters",
+            "homepage": "https://github.com/zendframework/zend-filter",
+            "keywords": [
+                "filter",
+                "zf2"
+            ],
+            "time": "2016-04-18 18:32:43"
+        },
+        {
+            "name": "zendframework/zend-hydrator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-hydrator.git",
+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.0@dev",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-inputfilter": "^2.6",
+                "zendframework/zend-serializer": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
+                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-release-1.0": "1.0-dev",
+                    "dev-release-1.1": "1.1-dev",
+                    "dev-master": "2.0-dev",
+                    "dev-develop": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Hydrator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-hydrator",
+            "keywords": [
+                "hydrator",
+                "zf2"
+            ],
+            "time": "2016-02-18 22:38:26"
+        },
+        {
+            "name": "zendframework/zend-i18n",
+            "version": "2.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-i18n.git",
+                "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
+                "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-filter": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-view": "^2.6.3"
+            },
+            "suggest": {
+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
+                "zendframework/zend-cache": "Zend\\Cache component",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
+                "zendframework/zend-filter": "You should install this package to use the provided filters",
+                "zendframework/zend-i18n-resources": "Translation resources",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "You should install this package to use the provided validators",
+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\I18n",
+                    "config-provider": "Zend\\I18n\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\I18n\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-i18n",
+            "keywords": [
+                "i18n",
+                "zf2"
+            ],
+            "time": "2016-06-07 21:08:30"
+        },
+        {
+            "name": "zendframework/zend-json",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-json.git",
+                "reference": "f42a1588e75c2a3e338cd94c37906231e616daab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/f42a1588e75c2a3e338cd94c37906231e616daab",
+                "reference": "f42a1588e75c2a3e338cd94c37906231e616daab",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "suggest": {
+                "zendframework/zend-json-server": "For implementing JSON-RPC servers",
+                "zendframework/zend-xml2json": "For converting XML documents to JSON"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Json\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "homepage": "https://github.com/zendframework/zend-json",
+            "keywords": [
+                "json",
+                "zf2"
+            ],
+            "time": "2016-04-01 02:34:00"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-serializer.git",
+                "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/ff74ea020f5f90866eb28365327e9bc765a61a6e",
+                "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-json": "^2.5 || ^3.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5",
+                "squizlabs/php_codesniffer": "^2.3.1",
+                "zendframework/zend-math": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
+                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Serializer",
+                    "config-provider": "Zend\\Serializer\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Serializer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "homepage": "https://github.com/zendframework/zend-serializer",
+            "keywords": [
+                "serializer",
+                "zf2"
+            ],
+            "time": "2016-06-21 17:01:55"
+        },
+        {
+            "name": "zendframework/zend-servicemanager",
+            "version": "2.7.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-servicemanager.git",
+                "reference": "eeecb78945c2a9f653caded36ba5274e8a8f5468"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/eeecb78945c2a9f653caded36ba5274e8a8f5468",
+                "reference": "eeecb78945c2a9f653caded36ba5274e8a8f5468",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "~1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "dev-master",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-di": "~2.5",
+                "zendframework/zend-mvc": "~2.5"
+            },
+            "suggest": {
+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
+                "zendframework/zend-di": "Zend\\Di component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\ServiceManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-servicemanager",
+            "keywords": [
+                "servicemanager",
+                "zf2"
+            ],
+            "time": "2016-09-01 19:03:15"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "2.7.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
+                "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-hydrator": "~1.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-inputfilter": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-release-2.7": "2.7-dev",
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "time": "2016-04-12 21:17:31"
+        },
+        {
+            "name": "zetacomponents/base",
+            "version": "1.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zetacomponents/Base.git",
+                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zetacomponents/Base/zipball/f20df24e8de3e48b6b69b2503f917e457281e687",
+                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687",
+                "shasum": ""
+            },
+            "require-dev": {
+                "zetacomponents/unit-test": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sergey Alexeev"
+                },
+                {
+                    "name": "Sebastian Bergmann"
+                },
+                {
+                    "name": "Jan Borsodi"
+                },
+                {
+                    "name": "Raymond Bosman"
+                },
+                {
+                    "name": "Frederik Holljen"
+                },
+                {
+                    "name": "Kore Nordmann"
+                },
+                {
+                    "name": "Derick Rethans"
+                },
+                {
+                    "name": "Vadym Savchuk"
+                },
+                {
+                    "name": "Tobias Schlitt"
+                },
+                {
+                    "name": "Alexandru Stanoi"
+                }
+            ],
+            "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
+            "homepage": "https://github.com/zetacomponents",
+            "time": "2014-09-19 03:28:34"
+        },
+        {
+            "name": "zetacomponents/document",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zetacomponents/Document.git",
+                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zetacomponents/Document/zipball/688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
+                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
+                "shasum": ""
+            },
+            "require": {
+                "zetacomponents/base": "*"
+            },
+            "require-dev": {
+                "zetacomponents/unit-test": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann"
+                },
+                {
+                    "name": "Kore Nordmann"
+                },
+                {
+                    "name": "Derick Rethans"
+                },
+                {
+                    "name": "Tobias Schlitt"
+                },
+                {
+                    "name": "Alexandru Stanoi"
+                }
+            ],
+            "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
+            "homepage": "https://github.com/zetacomponents",
+            "time": "2013-12-19 11:40:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": {
+        "jpgraph/jpgraph": 20,
+        "opus4-repo/codesniffer": 20
+    },
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}

From e8aba35d74d4a9242b5ea0167d0017f966cb346e Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Wed, 23 Nov 2016 16:16:26 +0100
Subject: [PATCH 102/115] OPUSVIER-3549 - Removed composer update call to force
 use of "official" composer.lock.

---
 bin/install-composer.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bin/install-composer.sh b/bin/install-composer.sh
index 804e7acce..b0b2dd09a 100755
--- a/bin/install-composer.sh
+++ b/bin/install-composer.sh
@@ -60,11 +60,6 @@ then
 		echo "failed self-updating composer" >&2
 		exit 1
 	}
-
-	php composer.phar update || {
-		echo "failed updating dependencies" >&2
-		exit 1
-	}
 else
 	# install composer
 	curl -s http://getcomposer.org/installer | php || {

From 5999dd4644f286cf328445dc5564c8be6f4d7ce1 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 24 Nov 2016 11:30:42 +0100
Subject: [PATCH 103/115] OPUSVIER-3662 - Run Composer without sudo. Always run
 "composer install".

---
 bin/install-composer.sh | 13 ++++++-------
 bin/install.sh          | 11 +++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/bin/install-composer.sh b/bin/install-composer.sh
index b0b2dd09a..827415177 100755
--- a/bin/install-composer.sh
+++ b/bin/install-composer.sh
@@ -33,7 +33,6 @@ SCRIPT_NAME="$(basename "$0")"
 SCRIPT_NAME_FULL="`readlink -f "$0"`"
 SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
 
-
 BASEDIR="`dirname "$SCRIPT_PATH"`"
 
 # get BASEDIR from first argument if present
@@ -66,10 +65,10 @@ else
 		echo "failed getting composer" >&2
 		exit 1
 	}
-
-	# install all dependencies
-	php composer.phar install || {
-		echo "failed installing dependencies" >&2
-		exit 1
-	}
 fi
+
+# install all dependencies
+php composer.phar install || {
+    echo "failed installing dependencies" >&2
+    exit 1
+}
diff --git a/bin/install.sh b/bin/install.sh
index 4c871c546..de7cfc513 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -117,16 +117,11 @@ if [[ $SUDO_ENABLED -eq 0 ]] ;
 then
     "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
 else
-    if [[ -e $BASEDIR/vendor ]] ;
-    then
-        echo "Skipping composer install/update since script is executed as root."
-        echo "Please run 'bin/install-composer.sh' separately without 'sudo'."
-    else
-        echo "Please run 'bin/install-composer.sh' without 'sudo' before the installation."
-        exit 1;
-    fi
+    sudo -u "$SUDO_USER" "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
 fi
 
+exit 0;
+
 #
 # Prepare Apache2 configuration
 #

From 5b2e96cb69b3885bfc8a2d0ec37278e9ae9ef22e Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 24 Nov 2016 16:20:10 +0100
Subject: [PATCH 104/115] OPUSVIER-3549 - Added CHANGES for OPUS 4.5 release.

---
 CHANGES.md | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 99a7d4c76..07b5663d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,141 @@
 
 ---
 
+## Release 4.5 2016-11-25
+
+### Bugs
+
+* [OPUSVIER-1341] - Abspeichern von unzulässigen Werten für Feld server_state
+* [OPUSVIER-1561] - Performance-Probleme in Solrsearch_Model_CollectionRoles (wird auch von Publish-Modul benutzt!)
+* [OPUSVIER-1691] - Anzeige der zugewiesenen CollectionRoles auf der Frontdoor irreführend
+* [OPUSVIER-1860] - Block "Metadaten exportieren" in der Frontdoor mit zu geringer Höhe
+* [OPUSVIER-2196] - Script "opus-create-export-xml.php" lässt sich nicht aufrufen
+* [OPUSVIER-2275] - UnitTest Solrsearch_IndexControllerTest::testLastPageUrlEqualsNextPageUrlDocTypeArticle erfordert genau 20 Dokumente
+* [OPUSVIER-2286] - Layoutfehler in der erweiterter Suche: Dropdowns unterschiedlich lang
+* [OPUSVIER-2357] - OAI-Set wird nur ausgegeben, wenn es ein Subset hat, an dem mindestens ein Dokument im Serverstate published hängt
+* [OPUSVIER-2358] - Irreführende Ausgabe bei leeren OAI-Subsets
+* [OPUSVIER-2375] - Fehler und Empfehlungen in der OAI-Schnittstelle
+* [OPUSVIER-2412] - Module "crawlers" und Guest-Zugriff darauf in Dokumentation erläutern
+* [OPUSVIER-2511] - Host- und Instancename in der Testumgebung sind leer
+* [OPUSVIER-2547] - DB-Schema hält Rolle 'owner' vor, die über das Framework nicht abgebildet wird.
+* [OPUSVIER-2615] - Nach dem zweimal hintereinander auf Login geklickt wurde, erscheint nach dem erfolgreichen Login das leere Login-Formular
+* [OPUSVIER-2660] - Problem mit Encoding auf dem CI-System
+* [OPUSVIER-3110] - Verzögerter Selenium Build Break in Jenkins
+* [OPUSVIER-3214] - Fataler Fehler, wenn User gelöscht wird, der noch eine Session besitzt
+* [OPUSVIER-3232] - Inkonsistentes Verhalten des Admin-Formulars bei Änderung von Sammlungseinträgen
+* [OPUSVIER-3347] - Unit Test Home_IndexControllerTest::testStartPageContainsTotalNumOfDocs läuft nicht mehr durch
+* [OPUSVIER-3381] - Unit Tests modifizieren Testdokument 146, so daß sich ServerDateModified ändert
+* [OPUSVIER-3472] - Sortierung Anzeige von Schriftenreihen auf der Frontdoor
+* [OPUSVIER-3477] - opus4ci.zib.de verschickt Mails an ungültige Mail-Adresse
+* [OPUSVIER-3508] - OAI-Schnittstelle liefert Volltext aus, bei gesetztem EmbargoDate
+* [OPUSVIER-3542] - OPUS-Update-Check funktioniert nicht mehr
+* [OPUSVIER-3599] - SolrIndexBuilder indiziert letzte (<16) Dokumente nicht
+* [OPUSVIER-3600] - Opus_UserRoleTest::testAccessDocumentsInsertRemove gebrochen
+* [OPUSVIER-3601] - opus4current.sql nicht korrekt verlinkt
+* [OPUSVIER-3602] - Search Engine Settings in config.ini.template falsch definiert
+* [OPUSVIER-3605] - Publish-Modul verwendet boolval (PHP 5.5) Funktion
+* [OPUSVIER-3606] - Verknüpfte Metadaten fehlen in Datenbank (RHEL, PHP 5.4, MariaDB)
+* [OPUSVIER-3609] - OPUS 4 Handbuch Job gebrochen auf CI-System
+* [OPUSVIER-3610] - Fehler beim Aufbau der Datenbank werden nicht angezeigt
+* [OPUSVIER-3611] - Optionale SQL Felder für Accounts dürfen nicht NULL sein und haben kein Defaultwert
+* [OPUSVIER-3614] - NOT NULL ohne DEFAULT in SQL Schema
+* [OPUSVIER-3617] - Fehler weil SQL für Testdokumente "server_date_created" nicht setzt
+* [OPUSVIER-3618] - Foreign Key Constraints Fehler beim Löschen von Sammlungen
+* [OPUSVIER-3619] - Speichern von VisibleInOAI = "false" für Opus_File schlägt fehl
+* [OPUSVIER-3620] - Fehler bei der Fehlerbehandlung in Oai_Model_Error Klasse
+* [OPUSVIER-3621] - SQL Fehler beim Abruf der ListSets in OAI
+* [OPUSVIER-3637] - Falsche Sortierung von Autoren mit führenden Leerzeichen im Namen
+* [OPUSVIER-3640] - Pfade für Dateien in Frontdoor META-Tags fehlerhaft
+* [OPUSVIER-3641] - Sortierreihenfolge von Dateien in Frontdoor falsch
+* [OPUSVIER-3643] - ORDER BY ist nicht in GROUP BY Fehler in SQL Statements
+* [OPUSVIER-3644] - ORDER BY ist nicht in SELECT list
+* [OPUSVIER-3645] - Warnung beim Speichern von zu langen Werten in der Datenbank
+* [OPUSVIER-3649] - Setzen von Admin Passwort bei der Installation schlägt fehl
+* [OPUSVIER-3651] - XMetaDissPlus soll Dokumente im Embargo nicht ausliefern
+
+### Features
+
+* [OPUSVIER-3230] - Lexikographische Sortierung der Facette Autor (Author) nach dem Nachnamen
+* [OPUSVIER-3563] - Erweiterung der Frontdoor um die Angabe "Gehört zur Bibliographie " (BelongsToBibliography)
+* [OPUSVIER-3575] - Repositorium spezifische Titel von RSS Feeds
+* [OPUSVIER-3636] - Autoren in Suchergebnissen als "Nachname, Vorname" anzeigen
+* [OPUSVIER-3646] - Navigation in Frontdoor mit Links/Rechts Cursortasten
+* [OPUSVIER-3652] - Autocomplete für GND Schlagwörter in Administration
+
+### Aufgaben
+
+* [OPUSVIER-231] - Entfernen von nicht mehr unterstützten Layouts inkl. MenuHelper aus dem System
+* [OPUSVIER-533] - Init-Skript für Selenium-RC Server erstellen
+* [OPUSVIER-889] - Aufnahme des Admin-Accounts für die Weboberfläche in des Install-Skript
+* [OPUSVIER-922] - Validierung von Username/Passwort an zu vielen Stellen
+* [OPUSVIER-1427] - Update Bibliotheken wie zum Beispiel Solr-Client, ZEND, usw.
+* [OPUSVIER-1473] - chmod im workspace Verzeichnis selektiver ausführen
+* [OPUSVIER-1617] - Installations-Script: Apache-Neustart am Ende des Install-Scripts auslagern
+* [OPUSVIER-1677] - Catchable Fatal errors entsprechend behandeln
+* [OPUSVIER-2313] - Anleitung zum Neustart des Selenium Servers
+* [OPUSVIER-2384] - Migration des CI-Systems auf leistungsfähige Hardware
+* [OPUSVIER-2578] - Zugriff auf Mailing-Listen Archiv
+* [OPUSVIER-2782] - Editieren von Collections im Metadaten-Formular
+* [OPUSVIER-2788] - Allgemeine Formularklassen für neues Metadaten-Formular
+* [OPUSVIER-3012] - XHTML DTDs lokal cachen um schnelle Validierungen zu ermöglichen
+* [OPUSVIER-3015] - Seiten im Modul Home durch XHTML Validierung abdecken
+* [OPUSVIER-3038] - Änderungen an Unit Tests sollten keinen Selenium Build triggern
+* [OPUSVIER-3070] - Server in Jenkins integrieren
+* [OPUSVIER-3073] - Automatische Konfiguration der mail.opus Einstellungen für CI System
+* [OPUSVIER-3074] - Framework Fast Target in Jenkins einrichten
+* [OPUSVIER-3077] - Selenium Target in Jenkins einrichten
+* [OPUSVIER-3078] - Migration Target in Jenkins einrichten
+* [OPUSVIER-3079] - Startup Script für SOLR auf dem CI-System
+* [OPUSVIER-3080] - Startup Script für OPUS SMTP Dumpserver auf dem CI-System
+* [OPUSVIER-3081] - CodeBrowser in Jenkins installieren (Problem mit Dependencies)
+* [OPUSVIER-3082] - CI-System verschickt Testmessages nach draußen
+* [OPUSVIER-3083] - Running Ant produziert "Unable to locate tools.jar" Meldung
+* [OPUSVIER-3084] - Jenkins URL auf dem CI-System von / nach /jenkins verschieben
+* [OPUSVIER-3085] - Jenkins Jobs auf Extended Email Plugin umstellen
+* [OPUSVIER-3086] - Regeln für parallele Builds definieren und dokumentieren
+* [OPUSVIER-3087] - Integrate Jenkins mit JIRA
+* [OPUSVIER-3088] - Automatisches Update der Demo-Instanz
+* [OPUSVIER-3093] - Setup Jenkins für automatischen Start nach opus4ci.zib.de boot
+* [OPUSVIER-3096] - Selenium Tests auf neuem CI-System fixen
+* [OPUSVIER-3097] - OPUS 4 Testserver von opus4mig nach opus4web umziehen
+* [OPUSVIER-3366] - Umstellung auf Solr-4.8
+* [OPUSVIER-3495] - Update Solr Schnittstelle 
+* [OPUSVIER-3517] - Update Solr auf opus4web zu Version 4.8 oder neuer
+* [OPUSVIER-3519] - Version von Schema in Datenbank speichern
+* [OPUSVIER-3524] - Update Selenium Instanz von GitHub Sourcen
+* [OPUSVIER-3531] - composer.phar für Build auf CI System verwenden
+* [OPUSVIER-3550] - Nacharbeiten zum Solr Update
+* [OPUSVIER-3552] - CI-System auf GitHub Entwicklung umstellen
+* [OPUSVIER-3593] - Alte SQL Dateien vom Framework entfernen
+* [OPUSVIER-3594] - Anzeigen mit welchem APPLICATION_ENV OPUS läuft
+* [OPUSVIER-3597] - Composer nicht mit "sudo" ausführen
+* [OPUSVIER-3604] - Selenium Tests fixen
+* [OPUSVIER-3612] - Ablauf des Embargo muss server_date_modified aktualisieren
+* [OPUSVIER-3615] - Skript für Datenbankveränderungen
+* [OPUSVIER-3616] - Accounts "user" und "referee" aus Masterdaten entfernen
+* [OPUSVIER-3638] - Funktion zum Löschen des Dokumentcaches hinzufügen
+* [OPUSVIER-3647] - .gitignore in ansonsten leeren Workspace-Verzeichnissen entfernen
+* [OPUSVIER-3648] - Konfigurationsdatei console.ini hinzufügen
+* [OPUSVIER-3650] - Datenbank Update für 4.5 Schema
+* [OPUSVIER-3658] - Workspace Verzeichnisse für Tests bei der Installation anlegen
+* [OPUSVIER-3659] - Fehlermeldungen bei der Ausführung von SQL Skripten 
+* [OPUSVIER-3662] - Composer Installation ohne SUDO ausführen
+
+## Dokumentation
+
+* [OPUSVIER-476] - Dokumentation der Datei- und Verzeichnisrechte
+* [OPUSVIER-828] - Platzierung von Dokumenten ohne Titel in Suchergebnissen erläutern
+* [OPUSVIER-1419] - Dokumentation der Datumsfelder
+* [OPUSVIER-1618] - Installations-Dokumentation: Apache-Einrichtung sollte *nach* Install-Script erklärt werden
+* [OPUSVIER-2453] - OPUS4-Webseite neu machen
+* [OPUSVIER-2559] - URN-Vergabe: vorgesehenen Dokument-Workflow dokumentieren
+* [OPUSVIER-2917] - Anleitung wie man Selenium lokal ohne Behinderung laufen lassen kann
+* [OPUSVIER-3410] - Kapitel 12.1 zum Import enthält falsche Informationen zum XML Schema
+* [OPUSVIER-3461] - jQuery UI Einbindung klären
+* [OPUSVIER-3551] - Installations- und Updateanleitung für 4.5
+
+---
+
 ## Release 4.5.0-RC1 2016-04-25
 
 ### Bugs

From 8289bf66e2fbe4b9cbbf057f2b79fe231548a4ba Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 24 Nov 2016 16:49:31 +0100
Subject: [PATCH 105/115] OPUSVIER-3549 - Corrections in CHANGES.

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 07b5663d1..9a78a0e90 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -61,7 +61,7 @@
 * [OPUSVIER-3575] - Repositorium spezifische Titel von RSS Feeds
 * [OPUSVIER-3636] - Autoren in Suchergebnissen als "Nachname, Vorname" anzeigen
 * [OPUSVIER-3646] - Navigation in Frontdoor mit Links/Rechts Cursortasten
-* [OPUSVIER-3652] - Autocomplete für GND Schlagwörter in Administration
+* [OPUSVIER-3652] - Vorschlagsfunktion für Schlagwörter (GND) in Administration (aus der Datenbank)
 
 ### Aufgaben
 
@@ -122,7 +122,7 @@
 * [OPUSVIER-3659] - Fehlermeldungen bei der Ausführung von SQL Skripten 
 * [OPUSVIER-3662] - Composer Installation ohne SUDO ausführen
 
-## Dokumentation
+### Dokumentation
 
 * [OPUSVIER-476] - Dokumentation der Datei- und Verzeichnisrechte
 * [OPUSVIER-828] - Platzierung von Dokumenten ohne Titel in Suchergebnissen erläutern

From 0ec632d09527fd5ad0f61febd3271a78cedb659e Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 24 Nov 2016 17:41:49 +0100
Subject: [PATCH 106/115] OPUSVIER-3549 - Release Notes updated.

---
 CHANGES.md       | 12 +++++------
 RELEASE_NOTES.md | 55 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9a78a0e90..1a9d5a7f8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -65,10 +65,10 @@
 
 ### Aufgaben
 
-* [OPUSVIER-231] - Entfernen von nicht mehr unterstützten Layouts inkl. MenuHelper aus dem System
-* [OPUSVIER-533] - Init-Skript für Selenium-RC Server erstellen
-* [OPUSVIER-889] - Aufnahme des Admin-Accounts für die Weboberfläche in des Install-Skript
-* [OPUSVIER-922] - Validierung von Username/Passwort an zu vielen Stellen
+* [OPUSVIER-231]  - Entfernen von nicht mehr unterstützten Layouts inkl. MenuHelper aus dem System
+* [OPUSVIER-533]  - Init-Skript für Selenium-RC Server erstellen
+* [OPUSVIER-889]  - Aufnahme des Admin-Accounts für die Weboberfläche in des Install-Skript
+* [OPUSVIER-922]  - Validierung von Username/Passwort an zu vielen Stellen
 * [OPUSVIER-1427] - Update Bibliotheken wie zum Beispiel Solr-Client, ZEND, usw.
 * [OPUSVIER-1473] - chmod im workspace Verzeichnis selektiver ausführen
 * [OPUSVIER-1617] - Installations-Script: Apache-Neustart am Ende des Install-Scripts auslagern
@@ -124,8 +124,8 @@
 
 ### Dokumentation
 
-* [OPUSVIER-476] - Dokumentation der Datei- und Verzeichnisrechte
-* [OPUSVIER-828] - Platzierung von Dokumenten ohne Titel in Suchergebnissen erläutern
+* [OPUSVIER-476]  - Dokumentation der Datei- und Verzeichnisrechte
+* [OPUSVIER-828]  - Platzierung von Dokumenten ohne Titel in Suchergebnissen erläutern
 * [OPUSVIER-1419] - Dokumentation der Datumsfelder
 * [OPUSVIER-1618] - Installations-Dokumentation: Apache-Einrichtung sollte *nach* Install-Script erklärt werden
 * [OPUSVIER-2453] - OPUS4-Webseite neu machen
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e9ccb6f21..53c68b8b4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,14 +2,61 @@
 
 ---
 
-## Release 4.5 2016-05-xx
+## Release 4.5 2016-11-25
+
+Dieser Release enhält viele Fehlerkorrekturen und grundlegenden Arbeiten
+um eine stabile und effektive Weiterentwicklung von OPUS 4 sicherzustellen.
+Eine Auflistung von Tickets findet sich in der Datei [CHANGES.md].
+ 
+Die aktuelle Release-Version von OPUS 4 befindet sich auf dem **master**
+Branch von https://github.com/opus4/application. Die Entwicklung wird
+auf dem Branch **4.6** weitergehen. Patches für kritische Bugs werden
+auch zwischen Releases zum **master** Branch hinzugefügt, um sie zügig
+den Repositorien zur Verfügung stellen zu können.
+
+Für diesen Release hat sich das Datenbankschema verändert. Nach der 
+Aktualisierung der Sourcen mit Git muss das Updateskript `bin/update.sh`
+ausgeführt werden, um das Datenbankschema auf den aktuellen Stand zu 
+bringen. Die Datenbank muss vor der Aktualisierung auf dem Stand von 
+OPUS 4.4.5, dem letzten Tarball-Release, sein.
+
+Bei den Abhängigkeiten (`composer.json`) ist jQuery-UI hinzugekommen.
+Beide Javascript-Bibliotheken, jQuery und jQuery-UI, werden nun von 
+Composer standardmässig installiert. Javascript wird vermehrt für neue 
+Funktionen im User Interface verwendet. Für eine Aktualisierung der 
+Abhängigkeiten das Skript `bin/install-composer.sh` ausführen, nach dem 
+die Sourcedateien mit Git auf den neuesten Stand gebracht wurden.
+
+Es gibt eine neue Konfigurationsdatei `console.ini`. In ihr stehen 
+Parameter, die nur für die lokal ausgeführten Skripte verwendet werden.
 
 Der Schlüssel 'name' in der `config.ini` kann verwendet werden, um den Namen 
 der Instanz zu definieren, z.B. 'OPUS 4 Demo'. Dieser Name wird z.B. im Titel
-von RSS Feeds eingesetzt, anstelle des bisherigen 'OPUS RSS Feed'.
+von RSS Feeds eingesetzt, anstelle des bisherigen 'OPUS RSS Feed'. Dadurch
+lassen sich Feeds von mehreren Instanzen leichter unterscheiden.
 
-In der neuen Konfigurationsdatei `console.ini` stehen Parameter, die nur für
-die lokal ausgeführten Skripte verwendet werden.
+Die Anzeige und Sortierung von Autoren wurde umgedreht und findet jetzt 
+zuerst nach dem Nachnahmen und dann dem Vornamen statt. Dafür muss eine
+Neuindizierung aller Dokumente durchgeführt werden. Das Indexschema hat 
+sich mit diesem Release nicht verändert.
+
+Bei der Navigation von Suchergebnissen in der Frontdoor können jetzt auch
+die Cursor-Tasten, rechts bzw. links, für den Wechsel zum nächsten oder
+vorherigen Dokument verwendet werden.
+
+In der Administration werden bei der Eingabe von GND-Schlagwörtern jetzt 
+Vorschläge angeboten. Diese Vorschläge kommen von den bereits im Repository
+vorhandenen Schlagwörtern und nicht aus den GND Daten. Es handelt sich
+um ein User Interface Experiment. Hilfen bei der Eingabe sollen weiter 
+ausgebaut werden. 
+
+Für weitere Informationen schauen Sie auf der OPUS 4 Homepage vorbei.
+
+http://www.opus-repository.org
+
+bzw.
+
+https://opus4.github.io
 
 ---
 

From 50cd7275887b17400094078afa7ac9b40d1f1b0b Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 1 Dec 2016 17:53:48 +0100
Subject: [PATCH 107/115] OPUSVIER-3549 - Removed debug code.

---
 bin/install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index de7cfc513..5a463bfde 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -120,8 +120,6 @@ else
     sudo -u "$SUDO_USER" "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
 fi
 
-exit 0;
-
 #
 # Prepare Apache2 configuration
 #
@@ -311,7 +309,7 @@ do
   fi
 done
 
-php $BASEDIR/scripts/change-password.php admin "$ADMIN_PWD"
+php "$BASEDIR/scripts/change-password.php" admin "$ADMIN_PWD"
 
 #
 # Install and configure Solr search server

From 375d1c35d03c55668b0e0afdd8f50ec5d71f1f84 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 1 Dec 2016 18:11:51 +0100
Subject: [PATCH 108/115] OPUSVIER-3549 - Prepare workspace at begin of
 installation.

---
 bin/install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index 5a463bfde..f9bbb00b3 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -105,6 +105,12 @@ then
     OPUS_URL_BASE="/$OPUS_URL_BASE"
 fi
 
+#
+# Prepare workspace
+#
+
+"$SCRIPT_PATH/prepare-workspace.sh"
+
 #
 # Install Composer and dependencies
 #
@@ -286,12 +292,6 @@ cp console.ini.template "$OPUS_CONSOLE_CONF"
 sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
        -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONSOLE_CONF"
 
-#
-# Prepare workspace
-#
-
-"$SCRIPT_PATH/prepare-workspace.sh"
-
 #
 # Set password for administrator account
 #

From cf508f7ffd2a8593ef3cc05889f8030fc0f6ea2d Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 1 Dec 2016 18:42:42 +0100
Subject: [PATCH 109/115] OPUSVIER-3549 - Set file permissions earlier, before
 indexing.

---
 bin/install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index f9bbb00b3..94e0966ae 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -292,6 +292,14 @@ cp console.ini.template "$OPUS_CONSOLE_CONF"
 sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
        -e "s!@db.admin.password@!'$DB_ADMIN_PASSWORD_ESC'!" "$OPUS_CONSOLE_CONF"
 
+#
+# Set file permissions
+#
+# TODO make it possible to run without sudo
+#
+
+"$SCRIPT_PATH/set-file-permissions.sh" -g www-data
+
 #
 # Set password for administrator account
 #
@@ -455,14 +463,6 @@ fi
 
 cd "$BASEDIR"
 
-#
-# Set file permissions
-#
-# TODO make it possible to run without sudo
-#
-
-"$SCRIPT_PATH/set-file-permissions.sh" -g www-data
-
 #
 # Restart Apache2 (optionally)
 #

From c1a1bccc3a7979b7d4193b34e42c4bb141c6c593 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Thu, 1 Dec 2016 18:54:26 +0100
Subject: [PATCH 110/115] OPUSVIER-3549 - Go back to basedir before setting
 permissions.

---
 bin/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/install.sh b/bin/install.sh
index 94e0966ae..2a6c8b842 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -298,6 +298,8 @@ sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
 # TODO make it possible to run without sudo
 #
 
+cd "$BASEDIR"
+
 "$SCRIPT_PATH/set-file-permissions.sh" -g www-data
 
 #

From 9f58c814e71d1fa00846058699bd90c116314d82 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 2 Dec 2016 14:47:52 +0100
Subject: [PATCH 111/115] OPUSVIER-3549 - Set permissions only if sudo. Handle
 if no files found.

---
 bin/install.sh              | 12 ++++++++++--
 bin/set-file-permissions.sh |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bin/install.sh b/bin/install.sh
index 2a6c8b842..d0e394ae5 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -295,12 +295,20 @@ sed -i -e "s!@db.admin.name@!'$DB_ADMIN_ESC'!" \
 #
 # Set file permissions
 #
-# TODO make it possible to run without sudo
 #
 
 cd "$BASEDIR"
 
-"$SCRIPT_PATH/set-file-permissions.sh" -g www-data
+if [[ $SUDO_ENABLED -eq 1 ]] ;
+then
+    "$SCRIPT_PATH/set-file-permissions.sh" -g www-data
+else
+    cat <<LimitString
+Make sure read/write permissions for workspace folder are setup properly. You can use to set default permissions:
+
+sudo bin/set-file-permissions.sh
+LimitString
+fi
 
 #
 # Set password for administrator account
diff --git a/bin/set-file-permissions.sh b/bin/set-file-permissions.sh
index 259707223..4b1f1f801 100755
--- a/bin/set-file-permissions.sh
+++ b/bin/set-file-permissions.sh
@@ -86,5 +86,5 @@ cd "$(readlink "$BASEDIR/workspace")"
 
 # Setting full access for owner and group but not others
 find workspace -type d -print0 | xargs -0 -- chmod 770
-find workspace -type f -print0 | xargs -0 -- chmod 660
+find workspace -type f -print0 | xargs -0 -- chmod -f 660
 

From 8a7099993030527c91018e869261bb332ec67a6e Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 2 Dec 2016 15:32:35 +0100
Subject: [PATCH 112/115] OPUSVIER-3549 - Run chmod for files only if there are
 any.

---
 bin/set-file-permissions.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/set-file-permissions.sh b/bin/set-file-permissions.sh
index 4b1f1f801..255b58e7b 100755
--- a/bin/set-file-permissions.sh
+++ b/bin/set-file-permissions.sh
@@ -86,5 +86,12 @@ cd "$(readlink "$BASEDIR/workspace")"
 
 # Setting full access for owner and group but not others
 find workspace -type d -print0 | xargs -0 -- chmod 770
-find workspace -type f -print0 | xargs -0 -- chmod -f 660
+
+FILES=$(find workspace -type f)
+FILE_COUNT=$(wc -l <<< "$FILES")
+
+if [ $FILE_COUNT -gt 0 ]; then
+    # TODO how to avoid running find twice (use $FILES)
+    find workspace -type f -print0 | xargs -0 -- chmod 660
+fi
 

From d31bdfeb87323d18fbc435d5ff787fe84cd8b9ac Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 2 Dec 2016 15:54:12 +0100
Subject: [PATCH 113/115] OPUSVIER-3549 - Fixing set-file-permissions script.

---
 bin/set-file-permissions.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/set-file-permissions.sh b/bin/set-file-permissions.sh
index 255b58e7b..bc5b68512 100755
--- a/bin/set-file-permissions.sh
+++ b/bin/set-file-permissions.sh
@@ -87,11 +87,10 @@ cd "$(readlink "$BASEDIR/workspace")"
 # Setting full access for owner and group but not others
 find workspace -type d -print0 | xargs -0 -- chmod 770
 
-FILES=$(find workspace -type f)
-FILE_COUNT=$(wc -l <<< "$FILES")
+FILE_COUNT=$(find workspace -type f | wc -l)
 
 if [ $FILE_COUNT -gt 0 ]; then
-    # TODO how to avoid running find twice (use $FILES)
+    # TODO how to avoid running find twice (store result in variable)
     find workspace -type f -print0 | xargs -0 -- chmod 660
 fi
 

From ec3d868e194b9adc3002ac7d012dd77853b9d86f Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Fri, 2 Dec 2016 15:58:22 +0100
Subject: [PATCH 114/115] OPUSVIER-3549 - Changed shebang to use more generic
 php.

---
 scripts/SolrIndexBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/SolrIndexBuilder.php b/scripts/SolrIndexBuilder.php
index 8ac89aedb..542b7e661 100755
--- a/scripts/SolrIndexBuilder.php
+++ b/scripts/SolrIndexBuilder.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php5
+#!/usr/bin/env php
 <?php
 /**
  * This file is part of OPUS. The software OPUS has been originally developed

From 65573164ac2d198148cd9fbd4b9f931fe577fff1 Mon Sep 17 00:00:00 2001
From: j3nsch <schwidder@zib.de>
Date: Tue, 6 Dec 2016 16:25:07 +0100
Subject: [PATCH 115/115] OPUSVIER-3549 - Updated release dates and added
 current version note.

---
 CHANGES.md       | 2 +-
 README.md        | 3 +++
 RELEASE_NOTES.md | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1a9d5a7f8..3362d881a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ---
 
-## Release 4.5 2016-11-25
+## Release 4.5 2016-12-06
 
 ### Bugs
 
diff --git a/README.md b/README.md
index de24f1db8..ca50d1947 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,9 @@ In 2015 the development was moved to GitHub in order to better support collabora
 efforts. The first OPUS 4 version developed at GitHub is 4.5. Starting with this version OPUS 4 should be installed
 using Git, since this will make updates for bug fixes and new features easier. More information can be found online.
 
+The current version of OPUS is 4.5. It is available using the 4.5 tag and on the master branch. The master branch 
+will be updated for releases or if urgent bugs have been fixed.
+
 [Documentation][DOC]
 : Information on setting up a repository, for users and administrators.
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 53c68b8b4..394342c79 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,7 +2,7 @@
 
 ---
 
-## Release 4.5 2016-11-25
+## Release 4.5 2016-12-06
 
 Dieser Release enhält viele Fehlerkorrekturen und grundlegenden Arbeiten
 um eine stabile und effektive Weiterentwicklung von OPUS 4 sicherzustellen.