Update phpunit to 6.0

s695345788 · Feb 3, 2017 · 858d13b · 858d13b
1 parent 8f122fd
commit 858d13b
Show file tree

Hide file tree

Showing 58 changed files with 251 additions and 253 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "PHP-ML - Machine Learning library for PHP",
     "license": "MIT",
-    "keywords": ["machine learning","pattern recognition","neural network","computational learning theory","artificial intelligence"],
+    "keywords": ["machine learning","pattern recognition","neural network","computational learning theory","artificial intelligence","data science","feature extraction"],
     "homepage": "https://github.com/php-ai/php-ml",
     "authors": [
         {
@@ -20,7 +20,7 @@
         "php": ">=7.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5"
+        "phpunit/phpunit": "^6.0"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Phpml/Exception/SerializeException.php b/src/Phpml/Exception/SerializeException.php
@@ -26,5 +26,4 @@ public static function cantSerialize(string $classname)
     {
         return new self(sprintf('Class "%s" can not be serialized.', $classname));
     }
-
 }
diff --git a/tests/Phpml/Association/AprioriTest.php b/tests/Phpml/Association/AprioriTest.php
@@ -6,8 +6,9 @@
 
 use Phpml\Association\Apriori;
 use Phpml\ModelManager;
+use PHPUnit\Framework\TestCase;
 
-class AprioriTest extends \PHPUnit_Framework_TestCase
+class AprioriTest extends TestCase
 {
     private $sampleGreek = [
         ['alpha', 'beta', 'epsilon'],

diff --git a/tests/Phpml/Classification/DecisionTreeTest.php b/tests/Phpml/Classification/DecisionTreeTest.php
@@ -6,8 +6,9 @@
 
 use Phpml\Classification\DecisionTree;
 use Phpml\ModelManager;
+use PHPUnit\Framework\TestCase;
 
-class DecisionTreeTest extends \PHPUnit_Framework_TestCase
+class DecisionTreeTest extends TestCase
 {
     private $data = [
         ['sunny',        85,        85,    'false',    'Dont_play'    ],
@@ -73,7 +74,6 @@ public function testSaveAndRestore()
         $restoredClassifier = $modelManager->restoreFromFile($filepath);
         $this->assertEquals($classifier, $restoredClassifier);
         $this->assertEquals($predicted, $restoredClassifier->predict($testSamples));
-
     }
 
     public function testTreeDepth()

diff --git a/tests/Phpml/Classification/KNearestNeighborsTest.php b/tests/Phpml/Classification/KNearestNeighborsTest.php
@@ -7,8 +7,9 @@
 use Phpml\Classification\KNearestNeighbors;
 use Phpml\Math\Distance\Chebyshev;
 use Phpml\ModelManager;
+use PHPUnit\Framework\TestCase;
 
-class KNearestNeighborsTest extends \PHPUnit_Framework_TestCase
+class KNearestNeighborsTest extends TestCase
 {
     public function testPredictSingleSampleWithDefaultK()
     {

diff --git a/tests/Phpml/Classification/NaiveBayesTest.php b/tests/Phpml/Classification/NaiveBayesTest.php
@@ -6,8 +6,9 @@
 
 use Phpml\Classification\NaiveBayes;
 use Phpml\ModelManager;
+use PHPUnit\Framework\TestCase;
 
-class NaiveBayesTest extends \PHPUnit_Framework_TestCase
+class NaiveBayesTest extends TestCase
 {
     public function testPredictSingleSample()
     {
@@ -44,7 +45,6 @@ public function testPredictArrayOfSamples()
         $testSamples = [[1, 1, 6], [5, 1, 1]];
         $testLabels = ['d', 'a'];
         $this->assertEquals($testLabels, $classifier->predict($testSamples));
-
     }
 
     public function testSaveAndRestore()
@@ -68,5 +68,4 @@ public function testSaveAndRestore()
         $this->assertEquals($classifier, $restoredClassifier);
         $this->assertEquals($predicted, $restoredClassifier->predict($testSamples));
     }
-
 }
diff --git a/tests/Phpml/Classification/SVCTest.php b/tests/Phpml/Classification/SVCTest.php
@@ -7,8 +7,9 @@
 use Phpml\Classification\SVC;
 use Phpml\SupportVectorMachine\Kernel;
 use Phpml\ModelManager;
+use PHPUnit\Framework\TestCase;
 
-class SVCTest extends \PHPUnit_Framework_TestCase
+class SVCTest extends TestCase
 {
     public function testPredictSingleSampleWithLinearKernel()
     {

diff --git a/tests/Phpml/Clustering/DBSCANTest.php b/tests/Phpml/Clustering/DBSCANTest.php
@@ -5,8 +5,9 @@
 namespace tests\Clustering;
 
 use Phpml\Clustering\DBSCAN;
+use PHPUnit\Framework\TestCase;
 
-class DBSCANTest extends \PHPUnit_Framework_TestCase
+class DBSCANTest extends TestCase
 {
     public function testDBSCANSamplesClustering()
     {

diff --git a/tests/Phpml/Clustering/FuzzyCMeansTest.php b/tests/Phpml/Clustering/FuzzyCMeansTest.php
@@ -5,8 +5,9 @@
 namespace tests\Clustering;
 
 use Phpml\Clustering\FuzzyCMeans;
+use PHPUnit\Framework\TestCase;
 
-class FuzzyCMeansTest extends \PHPUnit_Framework_TestCase
+class FuzzyCMeansTest extends TestCase
 {
     public function testFCMSamplesClustering()
     {

diff --git a/tests/Phpml/Clustering/KMeansTest.php b/tests/Phpml/Clustering/KMeansTest.php
@@ -5,8 +5,9 @@
 namespace tests\Clustering;
 
 use Phpml\Clustering\KMeans;
+use PHPUnit\Framework\TestCase;
 
-class KMeansTest extends \PHPUnit_Framework_TestCase
+class KMeansTest extends TestCase
 {
     public function testKMeansSamplesClustering()
     {

diff --git a/tests/Phpml/CrossValidation/RandomSplitTest.php b/tests/Phpml/CrossValidation/RandomSplitTest.php
@@ -6,8 +6,9 @@
 
 use Phpml\CrossValidation\RandomSplit;
 use Phpml\Dataset\ArrayDataset;
+use PHPUnit\Framework\TestCase;
 
-class RandomSplitTest extends \PHPUnit_Framework_TestCase
+class RandomSplitTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\InvalidArgumentException

diff --git a/tests/Phpml/CrossValidation/StratifiedRandomSplitTest.php b/tests/Phpml/CrossValidation/StratifiedRandomSplitTest.php
@@ -6,8 +6,9 @@
 
 use Phpml\CrossValidation\StratifiedRandomSplit;
 use Phpml\Dataset\ArrayDataset;
+use PHPUnit\Framework\TestCase;
 
-class StratifiedRandomSplitTest extends \PHPUnit_Framework_TestCase
+class StratifiedRandomSplitTest extends TestCase
 {
     public function testDatasetStratifiedRandomSplitWithEvenDistribution()
     {

diff --git a/tests/Phpml/Dataset/ArrayDatasetTest.php b/tests/Phpml/Dataset/ArrayDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\ArrayDataset;
+use PHPUnit\Framework\TestCase;
 
-class ArrayDatasetTest extends \PHPUnit_Framework_TestCase
+class ArrayDatasetTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\InvalidArgumentException

diff --git a/tests/Phpml/Dataset/CsvDatasetTest.php b/tests/Phpml/Dataset/CsvDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\CsvDataset;
+use PHPUnit\Framework\TestCase;
 
-class CsvDatasetTest extends \PHPUnit_Framework_TestCase
+class CsvDatasetTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\FileException

diff --git a/tests/Phpml/Dataset/Demo/GlassDatasetTest.php b/tests/Phpml/Dataset/Demo/GlassDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset\Demo;
 
 use Phpml\Dataset\Demo\GlassDataset;
+use PHPUnit\Framework\TestCase;
 
-class GlassDatasetTest extends \PHPUnit_Framework_TestCase
+class GlassDatasetTest extends TestCase
 {
     public function testLoadingWineDataset()
     {

diff --git a/tests/Phpml/Dataset/Demo/IrisDatasetTest.php b/tests/Phpml/Dataset/Demo/IrisDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset\Demo;
 
 use Phpml\Dataset\Demo\IrisDataset;
+use PHPUnit\Framework\TestCase;
 
-class IrisDatasetTest extends \PHPUnit_Framework_TestCase
+class IrisDatasetTest extends TestCase
 {
     public function testLoadingIrisDataset()
     {

diff --git a/tests/Phpml/Dataset/Demo/WineDatasetTest.php b/tests/Phpml/Dataset/Demo/WineDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset\Demo;
 
 use Phpml\Dataset\Demo\WineDataset;
+use PHPUnit\Framework\TestCase;
 
-class WineDatasetTest extends \PHPUnit_Framework_TestCase
+class WineDatasetTest extends TestCase
 {
     public function testLoadingWineDataset()
     {

diff --git a/tests/Phpml/Dataset/FilesDatasetTest.php b/tests/Phpml/Dataset/FilesDatasetTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\FilesDataset;
+use PHPUnit\Framework\TestCase;
 
-class FilesDatasetTest extends \PHPUnit_Framework_TestCase
+class FilesDatasetTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\DatasetException

diff --git a/tests/Phpml/FeatureExtraction/StopWordsTest.php b/tests/Phpml/FeatureExtraction/StopWordsTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\FeatureExtraction;
 
 use Phpml\FeatureExtraction\StopWords;
+use PHPUnit\Framework\TestCase;
 
-class StopWordsTest extends \PHPUnit_Framework_TestCase
+class StopWordsTest extends TestCase
 {
     public function testCustomStopWords()
     {

diff --git a/tests/Phpml/FeatureExtraction/TfIdfTransformerTest.php b/tests/Phpml/FeatureExtraction/TfIdfTransformerTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\FeatureExtraction;
 
 use Phpml\FeatureExtraction\TfIdfTransformer;
+use PHPUnit\Framework\TestCase;
 
-class TfIdfTransformerTest extends \PHPUnit_Framework_TestCase
+class TfIdfTransformerTest extends TestCase
 {
     public function testTfIdfTransformation()
     {

diff --git a/tests/Phpml/FeatureExtraction/TokenCountVectorizerTest.php b/tests/Phpml/FeatureExtraction/TokenCountVectorizerTest.php
@@ -7,8 +7,9 @@
 use Phpml\FeatureExtraction\StopWords;
 use Phpml\FeatureExtraction\TokenCountVectorizer;
 use Phpml\Tokenization\WhitespaceTokenizer;
+use PHPUnit\Framework\TestCase;
 
-class TokenCountVectorizerTest extends \PHPUnit_Framework_TestCase
+class TokenCountVectorizerTest extends TestCase
 {
     public function testTransformationWithWhitespaceTokenizer()
     {

diff --git a/tests/Phpml/Math/Distance/ChebyshevTest.php b/tests/Phpml/Math/Distance/ChebyshevTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Metric;
 
 use Phpml\Math\Distance\Chebyshev;
+use PHPUnit\Framework\TestCase;
 
-class ChebyshevTest extends \PHPUnit_Framework_TestCase
+class ChebyshevTest extends TestCase
 {
     /**
      * @var Chebyshev

diff --git a/tests/Phpml/Math/Distance/EuclideanTest.php b/tests/Phpml/Math/Distance/EuclideanTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Metric;
 
 use Phpml\Math\Distance\Euclidean;
+use PHPUnit\Framework\TestCase;
 
-class EuclideanTest extends \PHPUnit_Framework_TestCase
+class EuclideanTest extends TestCase
 {
     /**
      * @var Euclidean

diff --git a/tests/Phpml/Math/Distance/ManhattanTest.php b/tests/Phpml/Math/Distance/ManhattanTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Metric;
 
 use Phpml\Math\Distance\Manhattan;
+use PHPUnit\Framework\TestCase;
 
-class ManhattanTest extends \PHPUnit_Framework_TestCase
+class ManhattanTest extends TestCase
 {
     /**
      * @var Manhattan

diff --git a/tests/Phpml/Math/Distance/MinkowskiTest.php b/tests/Phpml/Math/Distance/MinkowskiTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Metric;
 
 use Phpml\Math\Distance\Minkowski;
+use PHPUnit\Framework\TestCase;
 
-class MinkowskiTest extends \PHPUnit_Framework_TestCase
+class MinkowskiTest extends TestCase
 {
     /**
      * @var Minkowski

diff --git a/tests/Phpml/Math/Kernel/RBFTest.php b/tests/Phpml/Math/Kernel/RBFTest.php
@@ -5,8 +5,9 @@
 namespace test\Phpml\Math\Kernel;
 
 use Phpml\Math\Kernel\RBF;
+use PHPUnit\Framework\TestCase;
 
-class RBFTest extends \PHPUnit_Framework_TestCase
+class RBFTest extends TestCase
 {
     public function testComputeRBFKernelFunction()
     {

diff --git a/tests/Phpml/Math/MatrixTest.php b/tests/Phpml/Math/MatrixTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Math;
 
 use Phpml\Math\Matrix;
+use PHPUnit\Framework\TestCase;
 
-class MatrixTest extends \PHPUnit_Framework_TestCase
+class MatrixTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\InvalidArgumentException

diff --git a/tests/Phpml/Math/ProductTest.php b/tests/Phpml/Math/ProductTest.php
@@ -5,8 +5,9 @@
 namespace tests\Phpml\Math;
 
 use Phpml\Math\Product;
+use PHPUnit\Framework\TestCase;
 
-class ProductTest extends \PHPUnit_Framework_TestCase
+class ProductTest extends TestCase
 {
     public function testScalarProduct()
     {

diff --git a/tests/Phpml/Math/SetTest.php b/tests/Phpml/Math/SetTest.php
@@ -1,10 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace tests\Phpml\Math;
 
 use Phpml\Math\Set;
+use PHPUnit\Framework\TestCase;
 
-class SetTest extends \PHPUnit_Framework_TestCase
+class SetTest extends TestCase
 {
     public function testUnion()
     {

diff --git a/tests/Phpml/Math/Statistic/CorrelationTest.php b/tests/Phpml/Math/Statistic/CorrelationTest.php
@@ -5,8 +5,9 @@
 namespace test\Phpml\Math\StandardDeviation;
 
 use Phpml\Math\Statistic\Correlation;
+use PHPUnit\Framework\TestCase;
 
-class CorrelationTest extends \PHPUnit_Framework_TestCase
+class CorrelationTest extends TestCase
 {
     public function testPearsonCorrelation()
     {

diff --git a/tests/Phpml/Math/Statistic/MeanTest.php b/tests/Phpml/Math/Statistic/MeanTest.php
@@ -5,8 +5,9 @@
 namespace test\Phpml\Math\StandardDeviation;
 
 use Phpml\Math\Statistic\Mean;
+use PHPUnit\Framework\TestCase;
 
-class MeanTest extends \PHPUnit_Framework_TestCase
+class MeanTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\InvalidArgumentException

diff --git a/tests/Phpml/Math/Statistic/StandardDeviationTest.php b/tests/Phpml/Math/Statistic/StandardDeviationTest.php
@@ -5,8 +5,9 @@
 namespace test\Phpml\Math\StandardDeviation;
 
 use Phpml\Math\Statistic\StandardDeviation;
+use PHPUnit\Framework\TestCase;
 
-class StandardDeviationTest extends \PHPUnit_Framework_TestCase
+class StandardDeviationTest extends TestCase
 {
     public function testStandardDeviationOfPopulationSample()
     {

diff --git a/tests/Phpml/Metric/AccuracyTest.php b/tests/Phpml/Metric/AccuracyTest.php
@@ -9,8 +9,9 @@
 use Phpml\Dataset\Demo\IrisDataset;
 use Phpml\Metric\Accuracy;
 use Phpml\SupportVectorMachine\Kernel;
+use PHPUnit\Framework\TestCase;
 
-class AccuracyTest extends \PHPUnit_Framework_TestCase
+class AccuracyTest extends TestCase
 {
     /**
      * @expectedException \Phpml\Exception\InvalidArgumentException
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,4 @@ public static function cantSerialize(string $classname) @@
         {
             return new self(sprintf('Class "%s" can not be serialized.', $classname));
         }
     }