Run tests on PHPUnit 9, on PHP 7.4 and add .gitattributes to exclude dev files from exports

.gitattributes

@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml export-ignore
+/phpunit-legacy.xml export-ignore
+/tests export-ignore

.travis.yml

@@ -1,29 +1,27 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - hhvm # ignore errors, see below
-
 # lock distro so future defaults will not break the build
 dist: trusty
 
-matrix:
+jobs:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
   allow_failures:
-    - php: hhvm
-
-sudo: false
+    - php: hhvm-3.18
 
 install:
-  - composer install --no-interaction
+  - composer install
 
 script:
-  - vendor/bin/phpunit --coverage-text
+  - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi
+  - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit-legacy.xml; fi

composer.json

@@ -15,9 +15,12 @@
         "graphp/graph": "dev-master#fb198e4 as 1.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     },
     "autoload": {
         "psr-4": {"Graphp\\Algorithms\\": "src/"}
+    },
+    "autoload-dev": {
+        "psr-4": { "Graphp\\Tests\\Algorithms\\": "tests/" }
     }
 }

phpunit-legacy.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older-->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+         bootstrap="vendor/autoload.php" 
+         colors="true">
+    <testsuites>
+        <testsuite name="Algorithm Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

phpunit.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php" 
+         colors="true" 
+         cacheResult="false">
+    <testsuites>
+        <testsuite name="Algorithm Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory>./src/</directory>
+        </include>
+    </coverage>
+</phpunit>

tests/BipartitTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Bipartit as AlgorithmBipartit;
 use Graphp\Graph\Graph;
 
@@ -73,22 +75,22 @@ public function testGraphTriangleCycleIsNotBipartit()
     /**
      *
      * @param AlgorithmBipartit $alg
-     * @expectedException UnexpectedValueException
      * @depends testGraphTriangleCycleIsNotBipartit
      */
     public function testGraphTriangleCycleColorsInvalid(AlgorithmBipartit $alg)
     {
+        $this->setExpectedException('UnexpectedValueException');
         $alg->getColors();
     }
 
     /**
      *
      * @param AlgorithmBipartit $alg
-     * @expectedException UnexpectedValueException
      * @depends testGraphTriangleCycleIsNotBipartit
      */
     public function testGraphTriangleCycleColorVerticesInvalid(AlgorithmBipartit $alg)
     {
+        $this->setExpectedException('UnexpectedValueException');
         $alg->getColorVertices();
     }
 }

tests/CompleteTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Complete as AlgorithmComplete;
 use Graphp\Graph\Graph;
 

tests/ConnectedComponentsTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\ConnectedComponents as AlgorithmConnected;
 use Graphp\Graph\Graph;
 
@@ -81,9 +83,6 @@ public function testComponents()
         $this->assertEquals($ge, $alg->createGraphComponentVertex($v5));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidVertexPassedToAlgorithm()
     {
         $graph = new Graph();
@@ -92,6 +91,8 @@ public function testInvalidVertexPassedToAlgorithm()
         $v2 = $graph2->createVertex(12);
 
         $alg = new AlgorithmConnected($graph);
+
+        $this->setExpectedException('InvalidArgumentException');
         $alg->createGraphComponentVertex($v2);
     }
 }

tests/DegreeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Degree as AlgorithmDegree;
 use Graphp\Graph\Exception\UnderflowException;
 use Graphp\Graph\Exception\UnexpectedValueException;

tests/DetectNegativeCycleTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\DetectNegativeCycle;
 use Graphp\Graph\Graph;
 
@@ -20,21 +22,21 @@ public function testNullGraph()
      *
      * @param DetectNegativeCycle $alg
      * @depends testNullGraph
-     * @expectedException UnderflowException
      */
     public function testNullGraphHasNoCycle(DetectNegativeCycle $alg)
     {
+        $this->setExpectedException('UnderflowException');
         $alg->getCycleNegative();
     }
 
     /**
      *
      * @param DetectNegativeCycle $alg
      * @depends testNullGraph
-     * @expectedException UnderflowException
      */
     public function testNullGraphHasNoCycleGraph(DetectNegativeCycle $alg)
     {
+        $this->setExpectedException('UnderflowException');
         $alg->createGraph();
     }
 

tests/DirectedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Directed as AlgorithmDirected;
 use Graphp\Graph\Graph;
 

tests/EulerianTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Eulerian as AlgorithmEulerian;
 use Graphp\Graph\Graph;
 

tests/FlowTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Flow as AlgorithmFlow;
 use Graphp\Graph\Graph;
 
@@ -24,7 +26,6 @@ public function testEdgeWithZeroFlowIsConsideredFlow()
         $graph = new Graph();
         $graph->createEdgeDirected($graph->createVertex(1), $graph->createVertex(2))->setFlow(0);
 
-
         $alg = new AlgorithmFlow($graph);
 
         $this->assertTrue($alg->hasFlow());
@@ -81,18 +82,15 @@ public function testGraphBalance()
         $this->assertFalse($alg->isBalancedFlow());
     }
 
-    /**
-     * @expectedException UnexpectedValueException
-     */
     public function testVertexWithUndirectedEdgeHasInvalidFlow()
     {
         // 1 -- 2
         $graph = new Graph();
         $graph->createEdgeUndirected($graph->createVertex(1), $graph->createVertex(2))->setFlow(10);
 
-
         $alg = new AlgorithmFlow($graph);
 
+        $this->setExpectedException('UnexpectedValueException');
         $alg->getFlowVertex($graph->getVertex(1));
     }
 }

tests/GroupsTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Groups as AlgorithmGroups;
 use Graphp\Graph\Graph;
 

tests/LoopTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Graphp\Tests\Algorithms;
+
 use Graphp\Algorithms\Loop as AlgorithmLoop;
 use Graphp\Graph\Graph;
 

tests/MaxFlow/EdmondsKarpTest.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Graphp\Tests\Algorithms\MaxFlow;
+
 use Graphp\Algorithms\MaxFlow\EdmondsKarp as AlgorithmMaxFlowEdmondsKarp;
 use Graphp\Graph\Graph;
-use PHPUnit\Framework\TestCase;
+use Graphp\Tests\Algorithms\TestCase;
 
 class EdmondsKarpTest extends TestCase
 {
@@ -106,9 +108,6 @@ public function testEdgesMultiplePathsTree()
 //         $this->assertEquals(10, $alg->getFlowMax());
 //     }
 
-    /**
-     * @expectedException UnexpectedValueException
-     */
     public function testEdgesUndirected()
     {
         // 0 -[0/7]- 1
@@ -121,6 +120,7 @@ public function testEdgesUndirected()
         // 0 -[7/7]- 1
         $alg = new AlgorithmMaxFlowEdmondsKarp($v0, $v1);
 
+        $this->setExpectedException('UnexpectedValueException');
         $this->assertEquals(7, $alg->getFlowMax());
     }
 
@@ -136,10 +136,6 @@ public function testEdgesUndirected()
 //         $this->assertEquals(0.735802, $alg->getFlowMax());
 //     }
 
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidFlowToOtherGraph()
     {
         $graph1 = new Graph();
@@ -148,17 +144,16 @@ public function testInvalidFlowToOtherGraph()
         $graph2 = new Graph();
         $vg2 = $graph2->createVertex(2);
 
+        $this->setExpectedException('InvalidArgumentException');
         new AlgorithmMaxFlowEdmondsKarp($vg1, $vg2);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidFlowToSelf()
     {
         $graph = new Graph();
         $v1 = $graph->createVertex(1);
 
+        $this->setExpectedException('InvalidArgumentException');
         new AlgorithmMaxFlowEdmondsKarp($v1, $v1);
     }