Include Zend Framework 2 components

- Changes ZF2/PHP dependenies as we now include the components of the framework we use
- *.rpm & *.deb packaging adjustments

debian/control

@@ -13,6 +13,17 @@ Vcs-Browser: https://github.com/bareos/bareos-webui.git
 
 Package: bareos-webui
 Architecture: all
-Depends: apache2 | httpd, libapache2-mod-php | libapache2-mod-php5 | php | php-cgi, zendframework (>= 2.2.0) | zend-framework (>= 2.2.0) | php5-zendframework2 (>= 2.2.0), ${misc:Depends}
+Depends: apache2 | httpd, libapache2-mod-php | libapache2-mod-php5 | libapache2-mod-php7 | php | php5 | php7 | php-cgi,
+   php-common | php5-common | php7-common,
+   php-date | php5-date | php7-date,
+   php-intl | php5-intl | php7-intl,
+   php-openssl | php5-openssl | php7-openssl,
+   php-json | php5-json | php7-json,
+   php-mysql | php5-mysql | php7-mysql,
+   php-pgsql | php5-pgsql | php7-pgsql,
+   php-sqlite | php5-sqlite | php7-sqlite | php-sqlite3 | php5-sqlite3 | php7-sqlite3,
+   php-curl | php5-curl | php7-curl,
+   php-gettext | php5-gettext | php7-gettext,
+   ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - webui
  This package contains the webui.

init_autoloader.php

@@ -23,13 +23,14 @@
 
 $zf2Path = false;
 
-if (is_dir('vendor/ZF2/library')) {
-    $zf2Path = 'vendor/ZF2/library';
-} elseif (getenv('ZF2_PATH')) {      // Support for ZF2_PATH environment variable or git submodule
+if (is_dir('vendor/zendframework')) {
+    $zf2Path = 'vendor/zendframework';
+}
+/*elseif (getenv('ZF2_PATH')) {      // Support for ZF2_PATH environment variable or git submodule
     $zf2Path = getenv('ZF2_PATH');
 } elseif (get_cfg_var('zf2_path')) { // Support for zf2_path directive value
     $zf2Path = get_cfg_var('zf2_path');
-}
+}*/
 
 if ($zf2Path) {
     if (isset($loader)) {
@@ -54,6 +55,7 @@
     }
 }
 
+/*
 try {
    if (!class_exists('Zend\Loader\AutoloaderFactory')) {
       throw new RuntimeException('
@@ -67,4 +69,4 @@
 catch(Exception $e) {
    print $e->getMessage();
 }
-
+*/

packaging/obs/bareos-webui.spec

@@ -16,17 +16,43 @@ BuildArch:     noarch
 BuildRequires: autoconf automake bareos-common
 
 Requires: php >= 5.3.3
-Requires: php-ZendFramework2 >= 2.2.0
-#Requires: php-pdo
-#Requires: php-json
-#Requires: php-pcre
-#Requires: php-gd
-#Requires: php-xml
-# * PHP PDO Extension
-# * PHP intl Extension
-# * PHP PHAR Extension
-# * PHP DATE Extension
-# * PHP OpenSSL Extension
+Requires: php-bz2
+Requires: php-ctype
+Requires: php-curl
+Requires: php-date
+Requires: php-dom
+Requires: php-fileinfo
+Requires: php-filter
+Requires: php-gettext
+Requires: php-gd
+Requires: php-hash
+Requires: php-iconv
+Requires: php-intl
+Requires: php-json
+%if 0%{?suse_version}
+%else
+Requires: php-libxml
+%endif
+Requires: php-mbstring
+Requires: php-mysql
+Requires: php-openssl
+Requires: php-pcre
+Requires: php-pdo
+#Requires: php-pecl
+Requires: php-pgsql
+Requires: php-reflection
+Requires: php-session
+Requires: php-simplexml
+Requires: php-spl
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+Requires: php-sqlite3
+%else
+Requires: php-sqlite
+%endif
+Requires: php-xml
+Requires: php-xmlreader
+Requires: php-xmlwriter
+Requires: php-zip
 
 %if 0%{?suse_version}
 BuildRequires: apache2
@@ -53,9 +79,6 @@ BuildRequires: httpd-devel
 Requires:   cronie
 Requires:   httpd
 Requires:   mod_php
-#Requires:   php-pgsql php-mysql
-# not available?
-#php-sqlite
 %endif
 
 #define serverroot #(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX)/htdocs/

tests/selenium/webui-selenium-test.py

@@ -34,7 +34,7 @@ def test_bareos(self):
         driver.find_element_by_id("submit").click()
         driver.find_element_by_link_text("Director").click()
         driver.find_element_by_link_text("Messages").click()
-        driver.find_element_by_link_text("Schedule").click()
+        driver.find_element_by_link_text("Schedules").click()
         driver.find_element_by_link_text("Scheduler status").click()
         driver.find_element_by_link_text("Storages").click()
         driver.find_element_by_link_text("Clients").click()

vendor/.gitignore

@@ -1,6 +1 @@
 !.gitignore
-bin
-.composer
-composer
-zendframework
-autoload.php

vendor/autoload.php

@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInit6df5b8a1471c61873b9f5b638848d4d7::getLoader();