Merge pull request #139 from stronk7/bump_phpunit_65

kabalin · web-flow · commit 8eaf71685d1f · 2021-12-03T16:35:29.000Z
Bump to PHPUnit 6.5.x
diff --git a/composer.json b/composer.json
@@ -95,7 +95,7 @@
     "padraic/phar-updater": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7",
+    "phpunit/phpunit": "^6.5",
     "mockery/mockery": "^1.3"
   },
   "config": {
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Bridge/MoodlePluginCollectionTest.php b/tests/Bridge/MoodlePluginCollectionTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\Bridge\MoodlePluginCollection;
 use MoodlePluginCI\Tests\Fake\Bridge\DummyMoodlePlugin;
 
-class MoodlePluginCollectionTest extends \PHPUnit_Framework_TestCase
+class MoodlePluginCollectionTest extends \PHPUnit\Framework\TestCase
 {
     public function testSortByDependencies()
     {
diff --git a/tests/Bridge/MoodleTest.php b/tests/Bridge/MoodleTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Bridge\Moodle;
 
-class MoodleTest extends \PHPUnit_Framework_TestCase
+class MoodleTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetBranch()
     {
diff --git a/tests/Command/CopyPasteDetectorCommandTest.php b/tests/Command/CopyPasteDetectorCommandTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class CopyPasteDetectorCommandTest extends \PHPUnit_Framework_TestCase
+class CopyPasteDetectorCommandTest extends \PHPUnit\Framework\TestCase
 {
     private $pluginDir;
 
diff --git a/tests/Command/MessDetectorCommandTest.php b/tests/Command/MessDetectorCommandTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class MessDetectorCommandTest extends \PHPUnit_Framework_TestCase
+class MessDetectorCommandTest extends \PHPUnit\Framework\TestCase
 {
     private $pluginDir;
 
diff --git a/tests/Command/PHPLintCommandTest.php b/tests/Command/PHPLintCommandTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class PHPLintCommandTest extends \PHPUnit_Framework_TestCase
+class PHPLintCommandTest extends \PHPUnit\Framework\TestCase
 {
     private $pluginDir;
 
diff --git a/tests/Command/ParallelCommandTest.php b/tests/Command/ParallelCommandTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Process\Process;
 
-class ParallelCommandTest extends \PHPUnit_Framework_TestCase
+class ParallelCommandTest extends \PHPUnit\Framework\TestCase
 {
     protected function executeCommand(array $processes)
     {
diff --git a/tests/FileUpdatesTest.php b/tests/FileUpdatesTest.php
@@ -12,7 +12,7 @@
 
 namespace MoodlePluginCI\Tests;
 
-class FileUpdatesTest extends \PHPUnit_Framework_TestCase
+class FileUpdatesTest extends \PHPUnit\Framework\TestCase
 {
     public function testLocalCIPackageJSON()
     {
diff --git a/tests/FilesystemTestCase.php b/tests/FilesystemTestCase.php
@@ -14,7 +14,7 @@
 
 use Symfony\Component\Filesystem\Filesystem;
 
-class FilesystemTestCase extends \PHPUnit_Framework_TestCase
+class FilesystemTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string
diff --git a/tests/Installer/Database/DatabaseResolverTest.php b/tests/Installer/Database/DatabaseResolverTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Installer\Database\DatabaseResolver;
 
-class DatabaseResolverTest extends \PHPUnit_Framework_TestCase
+class DatabaseResolverTest extends \PHPUnit\Framework\TestCase
 {
     public function testType()
     {
diff --git a/tests/Installer/Database/MariaDBDatabaseTest.php b/tests/Installer/Database/MariaDBDatabaseTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Installer\Database\MariaDBDatabase;
 
-class MariaDBDatabaseTest extends \PHPUnit_Framework_TestCase
+class MariaDBDatabaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetCreateDatabaseCommand()
     {
diff --git a/tests/Installer/Database/MySQLDatabaseTest.php b/tests/Installer/Database/MySQLDatabaseTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Installer\Database\MySQLDatabase;
 
-class MySQLDatabaseTest extends \PHPUnit_Framework_TestCase
+class MySQLDatabaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetCreateDatabaseCommand()
     {
diff --git a/tests/Installer/Database/PostgresDatabaseTest.php b/tests/Installer/Database/PostgresDatabaseTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Installer\Database\PostgresDatabase;
 
-class PostgresDatabaseTest extends \PHPUnit_Framework_TestCase
+class PostgresDatabaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetCreateDatabaseCommand()
     {
diff --git a/tests/Installer/InstallOutputTest.php b/tests/Installer/InstallOutputTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class InstallOutputTest extends \PHPUnit_Framework_TestCase
+class InstallOutputTest extends \PHPUnit\Framework\TestCase
 {
     public function testProgressBar()
     {
diff --git a/tests/Installer/InstallTest.php b/tests/Installer/InstallTest.php
@@ -17,7 +17,7 @@
 use MoodlePluginCI\Installer\InstallOutput;
 use MoodlePluginCI\Tests\Fake\Installer\DummyInstaller;
 
-class InstallTest extends \PHPUnit_Framework_TestCase
+class InstallTest extends \PHPUnit\Framework\TestCase
 {
     public function testRunInstallation()
     {
diff --git a/tests/Installer/InstallerCollectionTest.php b/tests/Installer/InstallerCollectionTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\Installer\InstallOutput;
 use MoodlePluginCI\Tests\Fake\Installer\DummyInstaller;
 
-class InstallerCollectionTest extends \PHPUnit_Framework_TestCase
+class InstallerCollectionTest extends \PHPUnit\Framework\TestCase
 {
     public function testAll()
     {
diff --git a/tests/PluginValidate/Finder/CapabilityFinderTest.php b/tests/PluginValidate/Finder/CapabilityFinderTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\PluginValidate\Finder\CapabilityFinder;
 use MoodlePluginCI\PluginValidate\Finder\FileTokens;
 
-class CapabilityFinderTest extends \PHPUnit_Framework_TestCase
+class CapabilityFinderTest extends \PHPUnit\Framework\TestCase
 {
     public function testFindTokens()
     {
diff --git a/tests/PluginValidate/Finder/ClassFinderTest.php b/tests/PluginValidate/Finder/ClassFinderTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\PluginValidate\Finder\ClassFinder;
 use MoodlePluginCI\PluginValidate\Finder\FileTokens;
 
-class ClassFinderTest extends \PHPUnit_Framework_TestCase
+class ClassFinderTest extends \PHPUnit\Framework\TestCase
 {
     public function testFindTokens()
     {
diff --git a/tests/PluginValidate/Finder/FunctionFinderTest.php b/tests/PluginValidate/Finder/FunctionFinderTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\PluginValidate\Finder\FileTokens;
 use MoodlePluginCI\PluginValidate\Finder\FunctionFinder;
 
-class FunctionFinderTest extends \PHPUnit_Framework_TestCase
+class FunctionFinderTest extends \PHPUnit\Framework\TestCase
 {
     public function testFindTokens()
     {
diff --git a/tests/PluginValidate/Finder/TablePrefixFinderTest.php b/tests/PluginValidate/Finder/TablePrefixFinderTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\PluginValidate\Finder\FileTokens;
 use MoodlePluginCI\PluginValidate\Finder\TablePrefixFinder;
 
-class TablePrefixFinderTest extends \PHPUnit_Framework_TestCase
+class TablePrefixFinderTest extends \PHPUnit\Framework\TestCase
 {
     public function testFindTokens()
     {
diff --git a/tests/PluginValidate/PluginValidateTest.php b/tests/PluginValidate/PluginValidateTest.php
@@ -17,7 +17,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\GenericRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\ModuleRequirements;
 
-class PluginValidateTest extends \PHPUnit_Framework_TestCase
+class PluginValidateTest extends \PHPUnit\Framework\TestCase
 {
     public function testVerifyRequirements()
     {
diff --git a/tests/PluginValidate/Requirements/AuthRequirementsTest.php b/tests/PluginValidate/Requirements/AuthRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\AuthRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class AuthRequirementsTest extends \PHPUnit_Framework_TestCase
+class AuthRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var AuthRequirements
diff --git a/tests/PluginValidate/Requirements/BlockRequirementsTest.php b/tests/PluginValidate/Requirements/BlockRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\BlockRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class BlockRequirementsTest extends \PHPUnit_Framework_TestCase
+class BlockRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var BlockRequirements
diff --git a/tests/PluginValidate/Requirements/FilterRequirementsTest.php b/tests/PluginValidate/Requirements/FilterRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\FilterRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class FilterRequirementsTest extends \PHPUnit_Framework_TestCase
+class FilterRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var FilterRequirements
diff --git a/tests/PluginValidate/Requirements/FormatRequirementsTest.php b/tests/PluginValidate/Requirements/FormatRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\FormatRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class FormatRequirementsTest extends \PHPUnit_Framework_TestCase
+class FormatRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var FormatRequirements
diff --git a/tests/PluginValidate/Requirements/ModuleRequirementsTest.php b/tests/PluginValidate/Requirements/ModuleRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\ModuleRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class ModuleRequirementsTest extends \PHPUnit_Framework_TestCase
+class ModuleRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ModuleRequirements
diff --git a/tests/PluginValidate/Requirements/QuestionRequirementsTest.php b/tests/PluginValidate/Requirements/QuestionRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\QuestionRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class QuestionRequirementsTest extends \PHPUnit_Framework_TestCase
+class QuestionRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var QuestionRequirements
diff --git a/tests/PluginValidate/Requirements/RepositoryRequirementsTest.php b/tests/PluginValidate/Requirements/RepositoryRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\RepositoryRequirements;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class RepositoryRequirementsTest extends \PHPUnit_Framework_TestCase
+class RepositoryRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var RepositoryRequirements
diff --git a/tests/PluginValidate/Requirements/RequirementsResolverTest.php b/tests/PluginValidate/Requirements/RequirementsResolverTest.php
@@ -15,7 +15,7 @@
 use MoodlePluginCI\PluginValidate\Plugin;
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 
-class RequirementsResolverTest extends \PHPUnit_Framework_TestCase
+class RequirementsResolverTest extends \PHPUnit\Framework\TestCase
 {
     public function testResolveRequirements()
     {
diff --git a/tests/PluginValidate/Requirements/ThemeRequirementsTest.php b/tests/PluginValidate/Requirements/ThemeRequirementsTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\PluginValidate\Requirements\RequirementsResolver;
 use MoodlePluginCI\PluginValidate\Requirements\ThemeRequirements;
 
-class ThemeRequirementsTest extends \PHPUnit_Framework_TestCase
+class ThemeRequirementsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ThemeRequirements
diff --git a/tests/Process/ExecuteTest.php b/tests/Process/ExecuteTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 
-class ExecuteTest extends \PHPUnit_Framework_TestCase
+class ExecuteTest extends \PHPUnit\Framework\TestCase
 {
     protected function setUp()
     {
diff --git a/tests/Process/MoodleProcessTest.php b/tests/Process/MoodleProcessTest.php
@@ -16,7 +16,7 @@
 use MoodlePluginCI\Process\MoodlePhpException;
 use MoodlePluginCI\Process\MoodleProcess;
 
-class MoodleProcessTest extends \PHPUnit_Framework_TestCase
+class MoodleProcessTest extends \PHPUnit\Framework\TestCase
 {
     private $outputWithDebugging;
     private $outputWithoutDebugging;
diff --git a/tests/StandardResolverTest.php b/tests/StandardResolverTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\StandardResolver;
 
-class StandardResolverTest extends \PHPUnit_Framework_TestCase
+class StandardResolverTest extends \PHPUnit\Framework\TestCase
 {
     public function testHasStandard()
     {
diff --git a/tests/ValidateTest.php b/tests/ValidateTest.php
@@ -14,7 +14,7 @@
 
 use MoodlePluginCI\Validate;
 
-class ValidateTest extends \PHPUnit_Framework_TestCase
+class ValidateTest extends \PHPUnit\Framework\TestCase
 {
     public function testDirectory()
     {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use MoodlePluginCI\Bridge\MoodlePluginCollection;`
`16`	`16`	`use MoodlePluginCI\Tests\Fake\Bridge\DummyMoodlePlugin;`
`17`	`17`
`18`		`-class MoodlePluginCollectionTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class MoodlePluginCollectionTest extends \PHPUnit\Framework\TestCase`
`19`	`19`	`{`
`20`	`20`	`public function testSortByDependencies()`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`use MoodlePluginCI\Bridge\Moodle;`
`16`	`16`
`17`		`-class MoodleTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class MoodleTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`{`
`19`	`19`	`public function testGetBranch()`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use Symfony\Component\Console\Application;`
`18`	`18`	`use Symfony\Component\Console\Tester\CommandTester;`
`19`	`19`
`20`		`-class CopyPasteDetectorCommandTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class CopyPasteDetectorCommandTest extends \PHPUnit\Framework\TestCase`
`21`	`21`	`{`
`22`	`22`	`private $pluginDir;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`use Symfony\Component\Console\Tester\CommandTester;`
`20`	`20`	`use Symfony\Component\Process\Process;`
`21`	`21`
`22`		`-class ParallelCommandTest extends \PHPUnit_Framework_TestCase`
	`22`	`+class ParallelCommandTest extends \PHPUnit\Framework\TestCase`
`23`	`23`	`{`
`24`	`24`	`protected function executeCommand(array $processes)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace MoodlePluginCI\Tests;`
`14`	`14`
`15`		`-class FileUpdatesTest extends \PHPUnit_Framework_TestCase`
	`15`	`+class FileUpdatesTest extends \PHPUnit\Framework\TestCase`
`16`	`16`	`{`
`17`	`17`	`public function testLocalCIPackageJSON()`
`18`	`18`	`{`