From 3556fbb2d403c748e143fe68e8cb14fd756a9d29 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 21:23:24 -0400
Subject: [PATCH] cherry picking, update of phpunit for jessie
---
phpunit/bootstrap.php | 3 ++-
phpunit/lib/AlterncTest.php | 17 ++++++++++-------
phpunit/tests/bureau/class/m_adminTest.php | 5 ++++-
phpunit/tests/bureau/class/m_authipTest.php | 5 ++++-
phpunit/tests/bureau/class/m_broTest.php | 4 +++-
phpunit/tests/bureau/class/m_cronTest.php | 4 +++-
phpunit/tests/bureau/class/m_cryptoTest.php | 4 +++-
.../tests/bureau/class/m_debug_alterncTest.php | 4 +++-
phpunit/tests/bureau/class/m_domTest.php | 4 +++-
phpunit/tests/bureau/class/m_errTest.php | 4 +++-
phpunit/tests/bureau/class/m_exportTest.php | 4 +++-
phpunit/tests/bureau/class/m_ftpTest.php | 4 +++-
phpunit/tests/bureau/class/m_hooksTest.php | 4 +++-
phpunit/tests/bureau/class/m_htaTest.php | 4 +++-
phpunit/tests/bureau/class/m_logTest.php | 4 +++-
phpunit/tests/bureau/class/m_lxcTest.php | 4 +++-
phpunit/tests/bureau/class/m_memTest.php | 4 +++-
phpunit/tests/bureau/class/m_menuTest.php | 4 +++-
phpunit/tests/bureau/class/m_piwikTest.php | 4 +++-
phpunit/tests/bureau/class/m_quotaTest.php | 4 +++-
20 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index 294974d8..a02a5339 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -20,7 +20,7 @@ define('ALTERNC_PANEL',realpath(__DIR__."/../bureau"));; // Custom
define('PHPUNIT_DATASETS_PATH',realpath(__DIR__."/tests/_datasets"));
require_once ALTERNC_PANEL."/class/db_mysql.php";
require_once ALTERNC_PANEL."/class/functions.php";
-
+require_once ALTERNC_PANEL."/class/variables.php";
// General variables setup
// *********************
@@ -144,6 +144,7 @@ echo "*** In progress: mysql.sql imported\n";
$db = new \DB_system($database, $user, $password);
$cuid = 0;
$variables = new \m_variables();
+$msg = new \m_messages();
$mem = new \m_mem();
$err = new \m_err();
$authip = new \m_authip();
diff --git a/phpunit/lib/AlterncTest.php b/phpunit/lib/AlterncTest.php
index cdd4248d..d31eb8d3 100644
--- a/phpunit/lib/AlterncTest.php
+++ b/phpunit/lib/AlterncTest.php
@@ -3,9 +3,14 @@
* This is the abstract class for all tests
* @see http://phpunit.de/manual/
*/
-abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
+use PHPUnit\Framework\TestCase;
+use PHPUnit\DbUnit\TestCaseTrait;
+
+abstract class AlterncTest extends TestCase
{
- /**
+ use TestCaseTrait;
+
+ /**
* @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
*/
public function getConnection()
@@ -14,9 +19,9 @@ abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
$pdo = new PDO('mysql:dbname='.$database.';host=127.0.0.1',$user,$password);
return $this->createDefaultDBConnection($pdo);
}
-
+
/**
- *
+ *
* @param string $fileList
* @return \PHPUnit_Extensions_Database_DataSet_YamlDataSet
* @throws \Exception
@@ -40,8 +45,6 @@ abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
}
$compositeDataSet = new PHPUnit_Extensions_Database_DataSet_CompositeDataSet($datasetList);
return $dataSet;
- }
-
-
+ }
}
diff --git a/phpunit/tests/bureau/class/m_adminTest.php b/phpunit/tests/bureau/class/m_adminTest.php
index a7d86deb..dab4f9f5 100644
--- a/phpunit/tests/bureau/class/m_adminTest.php
+++ b/phpunit/tests/bureau/class/m_adminTest.php
@@ -2,7 +2,10 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_adminTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+class m_adminTest extends TestCase
{
/**
* @var m_admin
diff --git a/phpunit/tests/bureau/class/m_authipTest.php b/phpunit/tests/bureau/class/m_authipTest.php
index fef3d3ae..ac41dd6a 100644
--- a/phpunit/tests/bureau/class/m_authipTest.php
+++ b/phpunit/tests/bureau/class/m_authipTest.php
@@ -2,7 +2,10 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_authipTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+class m_authipTest extends TestCase
{
/**
* @var m_authip
diff --git a/phpunit/tests/bureau/class/m_broTest.php b/phpunit/tests/bureau/class/m_broTest.php
index 5073b94b..04dd8014 100644
--- a/phpunit/tests/bureau/class/m_broTest.php
+++ b/phpunit/tests/bureau/class/m_broTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_broTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_broTest extends TestCase
{
/**
* @var m_bro
diff --git a/phpunit/tests/bureau/class/m_cronTest.php b/phpunit/tests/bureau/class/m_cronTest.php
index 5e4afd53..6189c39a 100644
--- a/phpunit/tests/bureau/class/m_cronTest.php
+++ b/phpunit/tests/bureau/class/m_cronTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_cronTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_cronTest extends TestCase
{
/**
* @var m_cron
diff --git a/phpunit/tests/bureau/class/m_cryptoTest.php b/phpunit/tests/bureau/class/m_cryptoTest.php
index 9e3711f1..0d0248cf 100644
--- a/phpunit/tests/bureau/class/m_cryptoTest.php
+++ b/phpunit/tests/bureau/class/m_cryptoTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_cryptoTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_cryptoTest extends TestCase
{
/**
* @var m_crypto
diff --git a/phpunit/tests/bureau/class/m_debug_alterncTest.php b/phpunit/tests/bureau/class/m_debug_alterncTest.php
index 118c1221..3da87a03 100644
--- a/phpunit/tests/bureau/class/m_debug_alterncTest.php
+++ b/phpunit/tests/bureau/class/m_debug_alterncTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_debug_alterncTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_debug_alterncTest extends TestCase
{
/**
* @var m_debug_alternc
diff --git a/phpunit/tests/bureau/class/m_domTest.php b/phpunit/tests/bureau/class/m_domTest.php
index b07f2c4d..12892330 100644
--- a/phpunit/tests/bureau/class/m_domTest.php
+++ b/phpunit/tests/bureau/class/m_domTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_domTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_domTest extends TestCase
{
/**
* @var m_dom
diff --git a/phpunit/tests/bureau/class/m_errTest.php b/phpunit/tests/bureau/class/m_errTest.php
index ea946064..414b96fb 100644
--- a/phpunit/tests/bureau/class/m_errTest.php
+++ b/phpunit/tests/bureau/class/m_errTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_errTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_errTest extends TestCase
{
/**
* @var m_err
diff --git a/phpunit/tests/bureau/class/m_exportTest.php b/phpunit/tests/bureau/class/m_exportTest.php
index 6e5d8985..88f7f752 100644
--- a/phpunit/tests/bureau/class/m_exportTest.php
+++ b/phpunit/tests/bureau/class/m_exportTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_exportTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_exportTest extends TestCase
{
/**
* @var m_export
diff --git a/phpunit/tests/bureau/class/m_ftpTest.php b/phpunit/tests/bureau/class/m_ftpTest.php
index 75afc778..5ecbf4a0 100644
--- a/phpunit/tests/bureau/class/m_ftpTest.php
+++ b/phpunit/tests/bureau/class/m_ftpTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_ftpTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_ftpTest extends TestCase
{
/**
* @var m_ftp
diff --git a/phpunit/tests/bureau/class/m_hooksTest.php b/phpunit/tests/bureau/class/m_hooksTest.php
index 88cb7944..096b6e08 100644
--- a/phpunit/tests/bureau/class/m_hooksTest.php
+++ b/phpunit/tests/bureau/class/m_hooksTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_hooksTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_hooksTest extends TestCase
{
/**
* @var m_hooks
diff --git a/phpunit/tests/bureau/class/m_htaTest.php b/phpunit/tests/bureau/class/m_htaTest.php
index 25ecbda6..39089f46 100644
--- a/phpunit/tests/bureau/class/m_htaTest.php
+++ b/phpunit/tests/bureau/class/m_htaTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_htaTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_htaTest extends TestCase
{
/**
* @var m_hta
diff --git a/phpunit/tests/bureau/class/m_logTest.php b/phpunit/tests/bureau/class/m_logTest.php
index 57adaa9c..7dc8cd98 100644
--- a/phpunit/tests/bureau/class/m_logTest.php
+++ b/phpunit/tests/bureau/class/m_logTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_logTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_logTest extends TestCase
{
/**
* @var m_log
diff --git a/phpunit/tests/bureau/class/m_lxcTest.php b/phpunit/tests/bureau/class/m_lxcTest.php
index 6b37244f..77200f07 100644
--- a/phpunit/tests/bureau/class/m_lxcTest.php
+++ b/phpunit/tests/bureau/class/m_lxcTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
*/
-class m_lxcTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_lxcTest extends TestCase
{
/**
* @var m_lxc
diff --git a/phpunit/tests/bureau/class/m_memTest.php b/phpunit/tests/bureau/class/m_memTest.php
index d01dd4d2..00d87f8d 100644
--- a/phpunit/tests/bureau/class/m_memTest.php
+++ b/phpunit/tests/bureau/class/m_memTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
*/
-class m_memTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_memTest extends TestCase
{
/**
* @var m_mem
diff --git a/phpunit/tests/bureau/class/m_menuTest.php b/phpunit/tests/bureau/class/m_menuTest.php
index 665bc6dc..ba39cd7e 100644
--- a/phpunit/tests/bureau/class/m_menuTest.php
+++ b/phpunit/tests/bureau/class/m_menuTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
*/
-class m_menuTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_menuTest extends TestCase
{
/**
* @var m_menu
diff --git a/phpunit/tests/bureau/class/m_piwikTest.php b/phpunit/tests/bureau/class/m_piwikTest.php
index ac2f6a8f..b6e9a9be 100644
--- a/phpunit/tests/bureau/class/m_piwikTest.php
+++ b/phpunit/tests/bureau/class/m_piwikTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
*/
-class m_piwikTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_piwikTest extends TestCase
{
/**
* @var m_piwik
diff --git a/phpunit/tests/bureau/class/m_quotaTest.php b/phpunit/tests/bureau/class/m_quotaTest.php
index 31ec009b..8d61b169 100644
--- a/phpunit/tests/bureau/class/m_quotaTest.php
+++ b/phpunit/tests/bureau/class/m_quotaTest.php
@@ -2,7 +2,9 @@
/**
* Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
*/
-class m_quotaTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_quotaTest extends TestCase
{
/**
* @var m_quota