Skip to content

Commit

Permalink
fix(rest): Slim fixes for REST API
Browse files Browse the repository at this point in the history
Make changes required for Slim framework v4.

Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
  • Loading branch information
GMishx committed Feb 11, 2022
1 parent 5f80202 commit f430d04
Show file tree
Hide file tree
Showing 111 changed files with 1,370 additions and 933 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,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/
Expand Down Expand Up @@ -176,6 +177,7 @@ install/fossdash/fossdash-publish.py
src/reso/agent/version.php
src/reso/agent/reso
src/www/ui/css/bootstrap/
src/www/ui/scripts/bootstrap/

# Add all the Ubuntu consol log file
ubuntu-*
Expand Down
4 changes: 2 additions & 2 deletions src/cli/tests/test_cp2foss.php
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/cli/tests/test_fo_copyright_list.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -45,7 +45,7 @@ protected function setUp()
$this->testInstaller->init();
}

protected function tearDown()
protected function tearDown() : void
{
return;
$this->testInstaller->clear();
Expand Down
4 changes: 2 additions & 2 deletions src/cli/tests/test_fo_nomos_license_list.php
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/cli/tests/test_fossjobs.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static function setUpBeforeClass()
}

/* initialization */
protected function setUp()
protected function setUp() : void
{

fwrite(STDOUT, "--> Running " . __METHOD__ . " method.\n");
Expand Down Expand Up @@ -253,7 +253,7 @@ function test_list_agent_and_others()
/**
* \brief clean the env
*/
protected function tearDown()
protected function tearDown() : void
{
global $fossology_testconfig;

Expand Down
17 changes: 9 additions & 8 deletions src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@
"ext-mbstring": "*",
"ext-json" : "*",
"ext-xml" : "*",
"firebase/php-jwt": "v5.4.0",
"monolog/monolog" : "2.3.4",
"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.3",
"guzzlehttp/guzzle": "v7.3.0",
"phpoffice/phpspreadsheet": "1.18.0",
"twig/twig" : "v3.3.4",
"guzzlehttp/guzzle": "v7.4.1",
"phpoffice/phpspreadsheet": "1.19.0",
"twbs/bootstrap": "4.0.0"
},
"require-dev" : {
Expand All @@ -37,11 +38,11 @@
"hamcrest/hamcrest-php" : "v2.0.1",
"mockery/mockery" : "v1.3.5",
"myclabs/deep-copy" : "1.10.2",
"php-coveralls/php-coveralls" : "v2.4.3",
"php-coveralls/php-coveralls" : "v2.5.2",
"phpunit/phpunit" : "8.5.21",
"sebastian/phpcpd" : "4.1.0",
"squizlabs/php_codesniffer" : "3.6.0",
"phpstan/phpstan" : "0.12.99"
"squizlabs/php_codesniffer" : "3.6.1",
"phpstan/phpstan" : "1.2.0"
},
"autoload" : {
"psr-4" : {
Expand Down

0 comments on commit f430d04

Please sign in to comment.