fossology · ag4ums · Sep 14, 2018 · Jun 7, 2018 · Jul 10, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - 7.0
   - 5.6
   - 7.1
+  - 7.2
 addons:
   apt:
     packages: &default_packages
@@ -64,6 +65,7 @@ script:
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer require --no-update phpunit/phpunit ^5; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then composer require --dev --no-update phpunit/phpunit ^6; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]]; then composer require --dev --no-update phpunit/phpunit ^7; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then composer require --dev --no-update phpunit/phpunit ^7; fi
   - if [[ ! -z "${CHECKBEFORE}" ]]; then ${CHECKBEFORE}; fi
   - if [[ ! -z "${MAKETARGETS}" ]]; then make ${MAKETARGETS}; fi
   - if [[ ! -z "${PHPTESTSUITE}" ]]; then src/vendor/bin/phpunit -csrc/phpunit.xml --testsuite="${PHPTESTSUITE}"; fi
@@ -121,7 +123,9 @@ matrix:
             - *default_packages
             - clang-3.6
   ## PHP: phpcpd ##
-    - script: src/vendor/bin/phpcpd src/cli/ src/copyright/ src/decider*/ src/lib/ src/monk/ src/nomos/ src/readmeoss/ src/spdx2/ src/www/
+    - name: PHP-CPD
+      script: src/vendor/bin/phpcpd src/cli/ src/copyright/ src/decider*/ src/lib/ src/monk/ src/nomos/ src/readmeoss/ src/spdx2/ src/www/
   allow_failures:
     - script: src/vendor/bin/phpcpd src/cli/ src/copyright/ src/decider*/ src/lib/ src/monk/ src/nomos/ src/readmeoss/ src/spdx2/ src/www/
     - php: 7.1
+    - php: 7.2
diff --git a/debian/control b/debian/control
@@ -62,7 +62,7 @@ Description: architecture for analyzing software, web interface
 
 Package: fossology-scheduler
 Architecture: any
-Depends: fossology-common, ${shlibs:Depends}, ${misc:Depends}, heirloom-mailx
+Depends: fossology-common, ${shlibs:Depends}, ${misc:Depends}, heirloom-mailx | s-nail
 Conflicts: fossology-scheduler-single
 Description: architecture for analyzing software, scheduler
  The FOSSology project is a web based framework that allows you to

diff --git a/install/scripts/php-conf-fix.sh b/install/scripts/php-conf-fix.sh
@@ -4,22 +4,15 @@
 #
 # uses phpIni to store file path - change if required
 #
-PHP5_PATH=/etc/php5/apache2/php.ini
-PHP7_PATH=/etc/php/7.0/apache2/php.ini
-phpIni=""
+PHP_PATH=$(php --ini | awk '/\/etc\/php.*\/cli$/{print $5}')
+phpIni="${PHP_PATH}/../apache2/php.ini"
 
 echo 'Automated php.ini configuration adjustments'
 echo
 if [ -f /etc/redhat-release ]; then
     phpIni=/etc/php.ini
     TIMEZONE=`readlink -f /etc/localtime | sed 's%/usr/share/zoneinfo/%%'`
-elif [ -f ${PHP5_PATH} ]; then
-    phpIni=${PHP5_PATH}
-    TIMEZONE=`cat /etc/timezone`
-elif [ -f ${PHP7_PATH} ]; then
-    phpIni=${PHP7_PATH}
 else
-    phpIni=/etc/php5/apache2/php.ini
     TIMEZONE=`cat /etc/timezone`
 fi
 

diff --git a/src/composer.json b/src/composer.json
@@ -1,48 +1,62 @@
 {
-    "name": "fossology/fossology",
-    "description": "FOSSology is a open source license compliance software system and toolkit.",
-    "_readme": [
+    "name" : "fossology/fossology",
+    "description" : "FOSSology is a open source license compliance software system and toolkit.",
+    "_readme" : [
         "Copyright Siemens AG 2014-2016",
         "",
         "Copying and distribution of this file, with or without modification,",
         "are permitted in any medium without royalty provided the copyright",
         "notice and this notice are preserved.  This file is offered as-is,",
         "without any warranty."
     ],
-    "require": {
-        "monolog/monolog": "1.10.*",
-        "symfony/config": "2.6.*",
-        "symfony/http-foundation": "2.6.*",
-        "symfony/dependency-injection": "2.6.*",
-        "twig/twig": "1.*",
-        "twig/extensions": "1.*",
-        "easyrdf/easyrdf": "0.9.*",
-        "phpoffice/phpword": "v0.13.*"
+    "require" : {
+        "monolog/monolog" : "1.10.*",
+        "symfony/config" : "2.6.*",
+        "symfony/http-foundation" : "2.6.*",
+        "symfony/dependency-injection" : "2.6.*",
+        "twig/twig" : "1.*",
+        "twig/extensions" : "1.*",
+        "easyrdf/easyrdf" : "0.9.*",
+        "phpoffice/phpword" : "v0.13.*"
     },
-
-    "require-dev": {
-        "mockery/mockery": ">=0.9.1",
-        "hamcrest/hamcrest-php": "1.1.*",
-        "squizlabs/php_codesniffer": "1.*",
-        "sebastian/phpcpd": "2.*",
-        "satooshi/php-coveralls": "1.0.*",
-        "phpunit/phpunit": "~5"
+    "require-dev" : {
+        "mockery/mockery" : ">=0.9.1",
+        "hamcrest/hamcrest-php" : "1.1.*",
+        "squizlabs/php_codesniffer" : "1.*",
+        "sebastian/phpcpd" : "2.*",
+        "php-coveralls/php-coveralls" : "1.0.*",
+        "phpunit/phpunit" : "~5"
     },
-
-    "autoload": {
-        "psr-4": {
-            "Fossology\\Lib\\": "lib/php",
-            "Fossology\\Agent\\Copyright\\UI\\": "copyright/ui",
-            "Fossology\\DeciderJob\\UI\\": "deciderjob/ui",
-            "Fossology\\Decider\\UI\\": "decider/ui",
-            "Fossology\\DelAgent\\UI\\": "delagent/ui",
-            "Fossology\\UI\\Page\\": "www/ui/page"
+    "autoload" : {
+        "psr-4" : {
+            "Fossology\\Lib\\" : "lib/php",
+            "Fossology\\Agent\\Copyright\\UI\\" : "copyright/ui",
+            "Fossology\\DeciderJob\\UI\\" : "deciderjob/ui",
+            "Fossology\\Decider\\UI\\" : "decider/ui",
+            "Fossology\\DelAgent\\UI\\" : "delagent/ui",
+            "Fossology\\UI\\Page\\" : "www/ui/page"
         }
     },
-
-    "config": {
-        "platform": {
-            "php": "5.6"
+    "config" : {
+        "platform" : {
+            "php" : "5.6"
         }
-    }
+    },
+    "homepage" : "https://www.fossology.org/",
+    "license" : [
+        "GPL-2.0-only",
+        "LGPL-2.1-only"
+    ],
+    "support" : {
+        "email" : "[email protected]",
+        "issues" : "https://github.com/fossology/fossology/issues",
+        "wiki" : "https://github.com/fossology/fossology/wiki",
+        "source" : "https://github.com/fossology/fossology/"
+    },
+    "keywords" : [
+        "fossology",
+        "spdx",
+        "license-management",
+        "license"
+    ]
 }