update dependencies

ivailop · ivailop · commit f4c072eb3d58 · 2023-01-10T00:05:40.000-08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,8 +2,11 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/php:7.1-browsers
+      - image: cimg/php:7.4-browsers
     steps:
+      - run: |
+          sudo pecl install xdebug-3.1.6
+          # sudo docker-php-ext-enable xdebug
       - checkout
       - run:
           name: Get latest testspace client
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.1
+          php-version: 7.4
           extensions: sqlite
           tools: composer, phpcs, phpmd, phpunit
       - uses: actions/checkout@v3
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
  {
     "require-dev": {
-        "phpunit/phpunit": "4.8.*",
-        "phpunit/dbunit": ">=1.2",
+        "phpunit/phpunit": "^7.0",
+        "phpunit/dbunit": "^4.0",
         "phpunit/phpcov": "*",
         "squizlabs/php_codesniffer": "3.*",
         "phpmd/phpmd" : "@stable"
diff --git a/tests/system/WebTest.php b/tests/system/WebTest.php
@@ -4,8 +4,9 @@
  */
 class WebTest extends PHPUnit_Extensions_SeleniumTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->setBrowserUrl('http://localhost');
     }
 
diff --git a/tests/unit/controller/BankAccountControllerTest.php b/tests/unit/controller/BankAccountControllerTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class BankAccountControllerTest extends PHPUnit_Framework_TestCase
+class BankAccountControllerTest extends TestCase
 {
     protected $controller;
     protected $mapper;
@@ -12,8 +13,9 @@ class BankAccountControllerTest extends PHPUnit_Framework_TestCase
     /**
      * @covers BankAccountController::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->mapper = $this->getMockBuilder('BankAccountMapper')
                              ->disableOriginalConstructor()
                              ->getMock();
diff --git a/tests/unit/controller/BankAccountListControllerTest.php b/tests/unit/controller/BankAccountListControllerTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class BankAccountListControllerTest extends PHPUnit_Framework_TestCase
+class BankAccountListControllerTest extends TestCase
 {
     protected $controller;
     protected $mapper;
@@ -12,8 +13,9 @@ class BankAccountListControllerTest extends PHPUnit_Framework_TestCase
     /**
      * @covers BankAccountController::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->mapper = $this->getMockBuilder('BankAccountMapper')
                              ->disableOriginalConstructor()
                              ->getMock();
diff --git a/tests/unit/framework/ControllerFactoryTest.php b/tests/unit/framework/ControllerFactoryTest.php
@@ -1,16 +1,18 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class ControllerFactoryTest extends PHPUnit_Framework_TestCase
+class ControllerFactoryTest extends TestCase
 {
     protected $controllerFactory;
 
     /**
      * @covers ControllerFactory::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $mapper = $this->getMockBuilder('BankAccountMapper')
                        ->disableOriginalConstructor()
                        ->getMock();
diff --git a/tests/unit/framework/FrontControllerTest.php b/tests/unit/framework/FrontControllerTest.php
@@ -1,11 +1,12 @@
 <?php
 require_once 'fixture/TestController.php';
 require_once 'fixture/TestView.php';
+use PHPUnit\Framework\TestCase;
 
 /**
  * @medium
  */
-class FrontControllerTest extends PHPUnit_Framework_TestCase
+class FrontControllerTest extends TestCase
 {
     /**
      * @covers FrontController::__construct
diff --git a/tests/unit/framework/HashMapTest.php b/tests/unit/framework/HashMapTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class HashMapTest extends PHPUnit_Framework_TestCase
+class HashMapTest extends TestCase
 {
     /**
      * @covers HashMap::get
diff --git a/tests/unit/framework/MapperFactoryTest.php b/tests/unit/framework/MapperFactoryTest.php
@@ -1,16 +1,18 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class MapperFactoryTest extends PHPUnit_Framework_TestCase
+class MapperFactoryTest extends TestCase
 {
     protected $mapperFactory;
 
     /**
      * @covers MapperFactory::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->mapperFactory = new MapperFactory(new PDO('sqlite::memory:'));
     }
 
diff --git a/tests/unit/framework/RequestTest.php b/tests/unit/framework/RequestTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class RequestTest extends PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {
     /**
      * @covers Request::__call
diff --git a/tests/unit/framework/ResponseTest.php b/tests/unit/framework/ResponseTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class ResponseTest extends PHPUnit_Framework_TestCase
+class ResponseTest extends TestCase
 {
     /**
      * @covers Response::getHeaders
diff --git a/tests/unit/framework/RouterTest.php b/tests/unit/framework/RouterTest.php
@@ -1,13 +1,15 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @medium
  */
-class RouterTest extends PHPUnit_Framework_TestCase
+class RouterTest extends TestCase
 {
     protected $router;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $mapper = $this->getMockBuilder('BankAccountMapper')
                        ->disableOriginalConstructor()
                        ->getMock();
diff --git a/tests/unit/framework/ViewFactoryTest.php b/tests/unit/framework/ViewFactoryTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class ViewFactoryTest extends PHPUnit_Framework_TestCase
+class ViewFactoryTest extends TestCase
 {
     /**
      * @covers ViewFactory::getView
diff --git a/tests/unit/framework/ViewTest.php b/tests/unit/framework/ViewTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @medium
  */
-class ViewTest extends PHPUnit_Framework_TestCase
+class ViewTest extends TestCase
 {
     protected $request;
     protected $response;
@@ -11,8 +12,9 @@ class ViewTest extends PHPUnit_Framework_TestCase
     /**
      * @covers View::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->request  = new Request;
         $this->response = new Response;
         $this->view     = $this->getMockBuilder('View')
diff --git a/tests/unit/model/BankAccountTest.php b/tests/unit/model/BankAccountTest.php
@@ -1,8 +1,9 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class BankAccountTest extends PHPUnit_Framework_TestCase
+class BankAccountTest extends TestCase
 {
     /**
      * @covers BankAccount::getBalance
diff --git a/tests/unit/persistence/BankAccountMapperTest.php b/tests/unit/persistence/BankAccountMapperTest.php
@@ -2,23 +2,22 @@
 /**
  * @large
  */
-class BankAccountMapperTest extends PHPUnit_Extensions_Database_TestCase
+class BankAccountMapperTest extends \PHPUnit\DbUnit\TestCase
 {
     protected $db;
     protected $mapper;
 
     /**
      * @covers BankAccountMapper::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->db     = new PDO('sqlite::memory:');
         $this->mapper = new BankAccountMapper($this->db);
 
         $this->db->exec(
           file_get_contents(__DIR__ . '/../../../database/bankaccount.sql')
         );
-
         parent::setUp();
     }
 
diff --git a/tests/unit/view/BankAccountListViewTest.php b/tests/unit/view/BankAccountListViewTest.php
@@ -1,14 +1,16 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class BankAccountListViewTest extends PHPUnit_Framework_TestCase
+class BankAccountListViewTest extends TestCase
 {
     protected $request;
     protected $response;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->request = $this->getMockBuilder('Request')
                               ->disableOriginalConstructor()
                               ->getMock();
diff --git a/tests/unit/view/BankAccountViewTest.php b/tests/unit/view/BankAccountViewTest.php
@@ -1,14 +1,16 @@
 <?php
+use PHPUnit\Framework\TestCase;
 /**
  * @small
  */
-class BankAccountViewTest extends PHPUnit_Framework_TestCase
+class BankAccountViewTest extends TestCase
 {
     protected $request;
     protected $response;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->request = $this->getMockBuilder('Request')
                               ->disableOriginalConstructor()
                               ->getMock();

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`*/`
`5`	`5`	`class WebTest extends PHPUnit_Extensions_SeleniumTestCase`
`6`	`6`	`{`
`7`		`- protected function setUp()`
	`7`	`+ protected function setUp(): void`
`8`	`8`	`{`
	`9`	`+ parent::setUp();`
`9`	`10`	`$this->setBrowserUrl('http://localhost');`
`10`	`11`	`}`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,18 @@`
`1`	`1`	`<?php`
	`2`	`+use PHPUnit\Framework\TestCase;`
`2`	`3`	`/**`
`3`	`4`	`* @small`
`4`	`5`	`*/`
`5`		`-class MapperFactoryTest extends PHPUnit_Framework_TestCase`
	`6`	`+class MapperFactoryTest extends TestCase`
`6`	`7`	`{`
`7`	`8`	`protected $mapperFactory;`
`8`	`9`
`9`	`10`	`/**`
`10`	`11`	`* @covers MapperFactory::__construct`
`11`	`12`	`*/`
`12`		`- protected function setUp()`
	`13`	`+ protected function setUp(): void`
`13`	`14`	`{`
	`15`	`+ parent::setUp();`
`14`	`16`	`$this->mapperFactory = new MapperFactory(new PDO('sqlite::memory:'));`
`15`	`17`	`}`
`16`	`18`