Просмотр исходного кода

updating tests by dropping PHPunit 4.6 support

El RIDO 5 лет назад
Родитель
Сommit
6f90df9545

+ 1 - 1
composer.json

@@ -29,7 +29,7 @@
 		"yzalis/identicon" : "^2.0.0"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "^4.6 || ^5 || ^9"
+		"phpunit/phpunit" : "^5 || ^9"
 	},
 	"autoload" : {
 		"psr-4" : {

+ 1 - 1
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a0e6ddfb640e9d613dfb4bddd578cc94",
+    "content-hash": "c5e5c4d3d99ae93c94cc75e225aa50f5",
     "packages": [
         {
             "name": "paragonie/random_compat",

+ 2 - 1
tst/ConfigurationTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Configuration;
 
-class ConfigurationTest extends PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     private $_minimalConfig;
 

+ 2 - 1
tst/ConfigurationTestGenerator.php

@@ -408,13 +408,14 @@ class ConfigurationTestGenerator
  * DO NOT EDIT: This file is generated automatically using configGenerator.php
  */
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Controller;
 use PrivateBin\Data\Filesystem;
 use PrivateBin\Persistence\ServerSalt;
 use PrivateBin\Persistence\TrafficLimiter;
 use PrivateBin\Request;
 
-class ConfigurationCombinationsTest extends PHPUnit_Framework_TestCase
+class ConfigurationCombinationsTest extends TestCase
 {
     private $_conf;
 

+ 2 - 1
tst/ControllerTest.php

@@ -1,12 +1,13 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Controller;
 use PrivateBin\Data\Filesystem;
 use PrivateBin\Persistence\ServerSalt;
 use PrivateBin\Persistence\TrafficLimiter;
 use PrivateBin\Request;
 
-class ControllerTest extends PHPUnit_Framework_TestCase
+class ControllerTest extends TestCase
 {
     protected $_data;
 

+ 1 - 0
tst/ControllerWithDbTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Data\Database;
 
 require_once 'ControllerTest.php';

+ 2 - 1
tst/Data/DatabaseTest.php

@@ -1,9 +1,10 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Controller;
 use PrivateBin\Data\Database;
 
-class DatabaseTest extends PHPUnit_Framework_TestCase
+class DatabaseTest extends TestCase
 {
     private $_model;
 

+ 2 - 1
tst/Data/FilesystemTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Data\Filesystem;
 
-class FilesystemTest extends PHPUnit_Framework_TestCase
+class FilesystemTest extends TestCase
 {
     private $_model;
 

+ 2 - 1
tst/FilterTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Filter;
 
-class FilterTest extends PHPUnit_Framework_TestCase
+class FilterTest extends TestCase
 {
     public function testFilterMakesTimesHumanlyReadable()
     {

+ 2 - 1
tst/FormatV2Test.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\FormatV2;
 
-class FormatV2Test extends PHPUnit_Framework_TestCase
+class FormatV2Test extends TestCase
 {
     public function testFormatV2ValidatorValidatesCorrectly()
     {

+ 2 - 1
tst/I18nTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\I18n;
 
-class I18nTest extends PHPUnit_Framework_TestCase
+class I18nTest extends TestCase
 {
     private $_translations = array();
 

+ 2 - 1
tst/JsonApiTest.php

@@ -1,11 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Controller;
 use PrivateBin\Data\Filesystem;
 use PrivateBin\Persistence\ServerSalt;
 use PrivateBin\Request;
 
-class JsonApiTest extends PHPUnit_Framework_TestCase
+class JsonApiTest extends TestCase
 {
     protected $_model;
 

+ 2 - 1
tst/ModelTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Identicon\Identicon;
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Configuration;
 use PrivateBin\Data\Database;
 use PrivateBin\Model;
@@ -10,7 +11,7 @@ use PrivateBin\Persistence\ServerSalt;
 use PrivateBin\Persistence\TrafficLimiter;
 use PrivateBin\Vizhash16x16;
 
-class ModelTest extends PHPUnit_Framework_TestCase
+class ModelTest extends TestCase
 {
     private $_conf;
 

+ 2 - 1
tst/Persistence/PurgeLimiterTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Persistence\PurgeLimiter;
 
-class PurgeLimiterTest extends PHPUnit_Framework_TestCase
+class PurgeLimiterTest extends TestCase
 {
     private $_path;
 

+ 2 - 1
tst/Persistence/ServerSaltTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Persistence\ServerSalt;
 
-class ServerSaltTest extends PHPUnit_Framework_TestCase
+class ServerSaltTest extends TestCase
 {
     private $_path;
 

+ 2 - 1
tst/Persistence/TrafficLimiterTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Persistence\TrafficLimiter;
 
-class TrafficLimiterTest extends PHPUnit_Framework_TestCase
+class TrafficLimiterTest extends TestCase
 {
     private $_path;
 

+ 2 - 1
tst/RequestTest.php

@@ -1,8 +1,9 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Request;
 
-class RequestTest extends PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {
     public function setUp()
     {

+ 2 - 1
tst/ViewTest.php

@@ -1,9 +1,10 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\I18n;
 use PrivateBin\View;
 
-class ViewTest extends PHPUnit_Framework_TestCase
+class ViewTest extends TestCase
 {
     private static $error = 'foo bar';
 

+ 2 - 1
tst/Vizhash16x16Test.php

@@ -1,9 +1,10 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use PrivateBin\Persistence\ServerSalt;
 use PrivateBin\Vizhash16x16;
 
-class Vizhash16x16Test extends PHPUnit_Framework_TestCase
+class Vizhash16x16Test extends TestCase
 {
     private $_file;