Merge pull request #2107 from siemens/feat/php/update-deps

chore(composer): Update composer dependencies

Reviewed-by: shaheem.azmal@siemens.com
Tested-by: shaheem.azmal@siemens.com

.github/workflows/test-checks.yml

@@ -59,12 +59,12 @@ jobs:
         run: |
           ./utils/prepare-test -afty
 
-          #remove test all as delagent is failing
       - name: Unit tests
         env:
           PGHOST: 127.0.0.1
           PGPORT: 5432
         run: |
-          make all phpvendors test-cli test-copyright test-lib test-monk \
+          make all phpvendors
+          make test-cli test-copyright test-lib test-monk \
           test-nomos test-ojo test-reuser test-scheduler test-spdx2 \
           test-unifiedreport test-www

.gitignore

@@ -53,6 +53,8 @@ src/cli/fo_import_licenses
 src/cli/fo_usergroup
 src/cli/fossupload_status
 src/cli/exportLicenseRefUsingSPDX
+src/clixml/agent/version.php
+src/clixml/agent/clixml
 src/copyright/agent/copyright
 src/copyright/agent/keyword
 src/copyright/agent/fo_unicode_clean
@@ -130,6 +132,7 @@ src/ununpack/agent/departition
 src/ununpack/agent/ununpack
 src/ununpack/agent/departition-sa
 src/ununpack/agent/ununpack-sa
+src/ununpack/agent_tests/Unit/testconf
 src/wget_agent/agent/wget_agent
 variable.list
 /nbproject/private/
@@ -176,8 +179,10 @@ install/fossdash/fossdash-publish.py
 src/reso/agent/version.php
 src/reso/agent/reso
 src/www/ui/css/bootstrap/
-src/clixml/agent/version.php
-src/clixml/agent/clixml
+src/www/ui/scripts/bootstrap/
 
 # Add all the Ubuntu consol log file
 ubuntu-*
+
+# PHPUnit cache
+.phpunit.result.cache

debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>=9~), libglib2.0-dev, libmagic-dev, libxml2-dev,
  libboost-program-options-dev, libjsoncpp-dev, libjson-c-dev, libpq-dev,
  php7.0-cli|php7.2-cli|php7.3-cli|php7.4-cli, php-mbstring, php-zip,
  php-xml, libboost-system-dev, libboost-filesystem-dev, libgcrypt20-dev,
- composer, patch
+ composer
 Standards-Version: 3.9.1
 Homepage: https://fossology.org
 

src/Makefile

@@ -84,9 +84,6 @@ $(CLEANDIRS):
 
 phpvendors:
 	$(COMPOSER_PHAR) install -q
-	if ! patch --reverse --silent --force --dry-run $(TOP)/src/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php $(TOP)/RdfXml.php.patch; then \
-		patch --silent --force $(TOP)/src/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php $(TOP)/RdfXml.php.patch; \
-	fi
 	rm -rf $(TOP)/src/www/ui/css/bootstrap
 	rm -rf $(TOP)/src/www/ui/scripts/bootstrap
 	$(INSTALL_DATA) $(TOP)/src/vendor/twbs/bootstrap/dist/css/* -t $(TOP)/src/www/ui/css/bootstrap
@@ -96,9 +93,6 @@ composer_install:
 	@echo "current dir: '$${PWD}'"
 	$(INSTALL_DATA) composer.json composer.lock $(DESTDIR)$(MODDIR)
 	(cd $(DESTDIR)$(MODDIR); export COMPOSER_HOME=/dev/null; export COMPOSER_ALLOW_SUPERUSER=1; $(COMPOSER_PHAR) install --no-plugins --no-scripts --no-dev)
-	if ! patch --reverse --silent --force --dry-run $(DESTDIR)$(MODDIR)/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php $(TOP)/RdfXml.php.patch; then \
-		patch --silent --force $(DESTDIR)$(MODDIR)/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php $(TOP)/RdfXml.php.patch; \
-	fi
 	rm -rf $(DESTDIR)$(MODDIR)/www/ui/css/bootstrap
 	rm -rf $(DESTDIR)$(MODDIR)/www/ui/scripts/bootstrap
 	$(INSTALL_DATA) $(DESTDIR)$(MODDIR)/vendor/twbs/bootstrap/dist/css/* -t $(DESTDIR)$(MODDIR)/www/ui/css/bootstrap

src/cli/tests/test_cp2foss.php

@@ -99,7 +99,7 @@ public static function setUpBeforeClass()
 
 
   // this method is run once before each test method defined for this test class.
-  protected function setUp()
+  protected function setUp() : void
   {
 
     fwrite(STDOUT, "--> Running " . __METHOD__ . " method.\n");
@@ -418,7 +418,7 @@ function test_list_agent_and_others()
    * \brief clean the env
    */
   // this method is run once after each test method defined for this test class.
-  protected function tearDown()
+  protected function tearDown() : void
   {
 
     global $fossology_testconfig;

src/cli/tests/test_fo_copyright_list.php

@@ -29,7 +29,7 @@ class test_fo_copyright_list extends \PHPUnit\Framework\TestCase
   /** @var TestInstaller */
   private $testInstaller;
 
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->testDb = new TestPgDb("fossclitest");
     $tables = array('users','upload','uploadtree_a','uploadtree','copyright','groups','group_user_member','agent','copyright_decision','copyright_ars','ars_master','copyright_event');
@@ -45,7 +45,7 @@ protected function setUp()
     $this->testInstaller->init();
   }
 
-  protected function tearDown()
+  protected function tearDown() : void
   {
     return;
     $this->testInstaller->clear();

src/cli/tests/test_fo_nomos_license_list.php

@@ -112,7 +112,7 @@ public static function setUpBeforeClass()
 
 
   // this method is run once before each test method defined for this test class.
-  protected function setUp()
+  protected function setUp() : void
   {
 
     fwrite(STDOUT, "--> Running " . __METHOD__ . " method.\n");
@@ -245,7 +245,7 @@ function test_others()
    * \brief clean the env
    */
   // this method is run once after each test method defined for this test class.
-  protected function tearDown()
+  protected function tearDown() : void
   {
 
     global $fossology_testconfig;

src/cli/tests/test_fossjobs.php

@@ -102,7 +102,7 @@ public static function setUpBeforeClass()
   }
 
   /* initialization */
-  protected function setUp()
+  protected function setUp() : void
   {
 
     fwrite(STDOUT, "--> Running " . __METHOD__ . " method.\n");
@@ -253,7 +253,7 @@ function test_list_agent_and_others()
   /**
    * \brief clean the env
    */
-  protected function tearDown()
+  protected function tearDown() : void
   {
     global $fossology_testconfig;
 

src/composer.json

@@ -10,39 +10,39 @@
         "without any warranty."
     ],
     "require" : {
-        "easyrdf/easyrdf" : "v0.9.0",
+        "easyrdf/easyrdf" : "1.1.1",
         "ext-gettext": "*",
         "ext-mbstring": "*",
         "ext-json" : "*",
         "ext-xml" : "*",
-        "flexsounds/slim-symfony-di-container": "v1.0.3",
-        "firebase/php-jwt": "v5.2.0",
-        "monolog/monolog" : "1.25.5",
-        "phpoffice/phpword" : "v0.17.0",
-        "slim/slim": "v3.12.3",
-        "symfony/config" : "v3.4.46",
-        "symfony/http-foundation" : "v3.4.46",
-        "symfony/dependency-injection" : "v3.4.46",
-        "symfony/yaml" : "v3.4.46",
-        "twig/twig" : "v2.12.5",
-        "twig/extensions" : "v1.5.4",
-        "guzzlehttp/guzzle": "v6.5.5",
-        "container-interop/container-interop": "v1.2.0",
-        "phpoffice/phpspreadsheet": "^1",
+        "firebase/php-jwt": "v5.5.1",
+        "monolog/monolog" : "2.3.5",
+        "phpoffice/phpword" : "0.18.2",
+        "slim/slim": "4.8.1",
+        "slim/psr7": "1.4",
+        "symfony/config" : "v5.3.4",
+        "symfony/http-foundation" : "v5.3.7",
+        "symfony/dependency-injection" : "v5.3.8",
+        "symfony/translation" : "v5.3.9",
+        "symfony/yaml" : "v5.3.6",
+        "symfony/mime" : "v5.3.8",
+        "twig/twig" : "v3.3.4",
+        "guzzlehttp/guzzle": "v7.4.1",
+        "phpoffice/phpspreadsheet": "1.19.0",
         "twbs/bootstrap": "4.0.0"
     },
     "require-dev" : {
-        "doctrine/instantiator" : "v1.0.5",
+        "doctrine/instantiator" : "v1.4.0",
         "ext-posix" : "*",
         "ext-sqlite3" : "*",
         "hamcrest/hamcrest-php" : "v2.0.1",
-        "mockery/mockery" : "v1.3.3",
-        "myclabs/deep-copy" : "v1.7.0",
-        "php-coveralls/php-coveralls" : "v2.4.2",
-        "phpunit/phpunit" : "5.7.27 || 6.5.14",
-        "sebastian/phpcpd" : "v3.0.1",
-        "squizlabs/php_codesniffer" : "v3.5.8",
-        "phpstan/phpstan" : "v0.9.3"
+        "mockery/mockery" : "v1.3.5",
+        "myclabs/deep-copy" : "1.10.2",
+        "php-coveralls/php-coveralls" : "v2.5.2",
+        "phpunit/phpunit" : "8.5.21",
+        "sebastian/phpcpd" : "4.1.0",
+        "squizlabs/php_codesniffer" : "3.6.1",
+        "phpstan/phpstan" : "1.2.0"
     },
     "autoload" : {
         "psr-4" : {
@@ -57,7 +57,7 @@
     },
     "config" : {
         "platform" : {
-            "php" : "7.0.8"
+            "php" : "7.2.24"
         }
     },
     "homepage" : "https://www.fossology.org/",