fix(rest): Slim fixes for REST API

Make changes required for Slim framework v4. Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
fossology · Nov 3, 2021 · 9aafaf6 · 9aafaf6
1 parent 0a5c9e6
commit 9aafaf6
Show file tree

Hide file tree

Showing 95 changed files with 590 additions and 384 deletions.
diff --git a/src/cli/tests/test_cp2foss.php b/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;

diff --git a/src/cli/tests/test_fo_copyright_list.php b/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();

diff --git a/src/cli/tests/test_fo_nomos_license_list.php b/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;

diff --git a/src/cli/tests/test_fossjobs.php b/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;
 

diff --git a/src/composer.json b/src/composer.json
@@ -19,6 +19,7 @@
         "monolog/monolog" : "2.3.4",
         "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",

diff --git a/src/composer.lock b/src/composer.lock
diff --git a/src/decider/agent_tests/Unit/DeciderAgentTest.php b/src/decider/agent_tests/Unit/DeciderAgentTest.php
@@ -61,7 +61,7 @@ class DeciderAgentTest extends \PHPUnit\Framework\TestCase
    * @brief Setup test objects, database and repo
    * @see PHPUnit_Framework_TestCase::setUp()
    */
-  protected function setUp()
+  protected function setUp() : void
   {
     global $container;
     $container = M::mock('ContainerBuilder');
@@ -91,7 +91,7 @@ protected function setUp()
    * @brief Remove test objects
    * @see PHPUnit_Framework_TestCase::tearDown()
    */
-  protected function tearDown()
+  protected function tearDown() : void
   {
     $this->addToAssertionCount(\Hamcrest\MatcherAssert::getCount()-$this->assertCountBefore);
     M::close();

diff --git a/src/delagent/ui/delete-helper.php b/src/delagent/ui/delete-helper.php
@@ -12,7 +12,7 @@
  * @param $user_pk - the user_id
  * @param $group_pk - the group_id
  * @param $uploadDao - an instance of a uploadDao
- * @return string with the message.
+ * @return DeleteResponse with the message.
  */
 function TryToDelete($uploadpk, $user_pk, $group_pk, $uploadDao)
 {

diff --git a/src/lib/c/tests/testClib.php b/src/lib/c/tests/testClib.php
@@ -35,12 +35,12 @@ class TestCLib extends \PHPUnit\Framework\TestCase
   /** @var TestPgDb */
   private $testDb;
 
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->testDb = new TestPgDb("testlibc".time());
   }
 
-  protected function tearDown()
+  protected function tearDown() : void
   {
     $this->testDb = null;
   }

diff --git a/src/lib/php/Application/test/LicenseCsvExportTest.php b/src/lib/php/Application/test/LicenseCsvExportTest.php
@@ -33,7 +33,7 @@ class LicenseCsvExportTest extends \PHPUnit\Framework\TestCase
    * @brief One time setup for test
    * @see PHPUnit::Framework::TestCase::setUp()
    */
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->assertCountBefore = \Hamcrest\MatcherAssert::getCount();
   }
@@ -42,7 +42,7 @@ protected function setUp()
    * @brief Close mockery
    * @see PHPUnit::Framework::TestCase::tearDown()
    */
-  protected function tearDown()
+  protected function tearDown() : void
   {
     $this->addToAssertionCount(\Hamcrest\MatcherAssert::getCount()-$this->assertCountBefore);
     M::close();

diff --git a/src/lib/php/Application/test/LicenseCsvImportTest.php b/src/lib/php/Application/test/LicenseCsvImportTest.php
@@ -36,7 +36,7 @@ class LicenseCsvImportTest extends \PHPUnit\Framework\TestCase
    * @brief One time setup for test
    * @see PHPUnit::Framework::TestCase::setUp()
    */
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->assertCountBefore = \Hamcrest\MatcherAssert::getCount();
   }
@@ -45,7 +45,7 @@ protected function setUp()
    * @brief Close mockery
    * @see PHPUnit::Framework::TestCase::tearDown()
    */
-  protected function tearDown()
+  protected function tearDown() : void
   {
     $this->addToAssertionCount(\Hamcrest\MatcherAssert::getCount()-$this->assertCountBefore);
     M::close();

diff --git a/src/lib/php/Application/test/RepositoryApiTest.php b/src/lib/php/Application/test/RepositoryApiTest.php
@@ -37,7 +37,7 @@ class RepositoryApiTest extends \PHPUnit\Framework\TestCase
    * Mock the CurlRequest class and set mockCurlRequest variable
    * @see PHPUnit::Framework::TestCase::setUp()
    */
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->mockCurlRequest = \Mockery::mock('CurlRequest');
 
@@ -58,7 +58,7 @@ protected function setUp()
    * @brief Tear down mock objects
    * @see PHPUnit::Framework::TestCase::tearDown()
    */
-  public function tearDown()
+  public function tearDown() : void
   {
     \Mockery::close();
   }

diff --git a/src/lib/php/Application/test/UserInfoTest.php b/src/lib/php/Application/test/UserInfoTest.php
@@ -33,7 +33,7 @@ class UserInfoTest extends \PHPUnit\Framework\TestCase
    * @brief One time setup for test
    * @see PHPUnit::Framework::TestCase::setUp()
    */
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->userInfo = new UserInfo();
   }

diff --git a/src/lib/php/BusinessRules/test/AgentLicenseEventProcessorTest.php b/src/lib/php/BusinessRules/test/AgentLicenseEventProcessorTest.php
@@ -40,7 +40,7 @@ class AgentLicenseEventProcessorTest extends \PHPUnit\Framework\TestCase
   private $latestScanners = array(array('agent_pk'=>23,'agent_name'=>'nomos'),
                     array('agent_pk'=>22,'agent_name'=>'monk'));
 
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->licenseDao = M::mock(LicenseDao::class);
     $this->agentsDao = M::mock(AgentDao::class);
@@ -60,7 +60,7 @@ protected function setUp()
     $container->shouldReceive('get')->withArgs(array('db.manager'))->andReturn($this->dbManagerMock);
   }
 
-  protected function tearDown()
+  protected function tearDown() : void
   {
     M::close();
   }

diff --git a/src/lib/php/BusinessRules/test/ClearingDecisionFilterTest.php b/src/lib/php/BusinessRules/test/ClearingDecisionFilterTest.php
@@ -29,12 +29,12 @@ class ClearingDecisionFilterTest extends \PHPUnit\Framework\TestCase
   /** @var ClearingDecisionFilter */
   private $clearingDecisionFilter;
 
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->clearingDecisionFilter = new ClearingDecisionFilter();
   }
 
-  protected function tearDown()
+  protected function tearDown() : void
   {
     M::close();
   }

diff --git a/src/lib/php/BusinessRules/test/ClearingDecisionProcessorTest.php b/src/lib/php/BusinessRules/test/ClearingDecisionProcessorTest.php
@@ -65,7 +65,7 @@ class ClearingDecisionProcessorTest extends \PHPUnit\Framework\TestCase
   /** @var boolean */
   private $includeSubFolders;
 
-  protected function setUp()
+  protected function setUp() : void
   {
     $this->uploadTreeId = 432;
     $this->pfileId = 32;
@@ -92,7 +92,7 @@ protected function setUp()
     $this->assertCountBefore = \Hamcrest\MatcherAssert::getCount();
   }
 
-  protected function tearDown()
+  protected function tearDown() : void
   {
     $this->addToAssertionCount(\Hamcrest\MatcherAssert::getCount()-$this->assertCountBefore);
     M::close();