Merge pull request #200 from SimonFrings/tests09

Run tests on PHP7.4, PHP8 and PHPUnit 9.3

Author: clue

.gitattributes

@@ -0,0 +1,7 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/phpunit.xml.legacy 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.xml.legacy; fi

README.md

@@ -115,7 +115,7 @@ $ composer require clue/graph:^0.9.1
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 
 This project aims to run on any platform and thus does not require any PHP
-extensions and supports running on legacy PHP 5.3 through current PHP 7+ and
+extensions and supports running on legacy PHP 5.3 through current PHP 8+ and
 HHVM.
 It's *highly recommended to use PHP 7+* for this project.
 

composer.json

@@ -22,10 +22,10 @@
         }
     },
     "require": {
-        "php": "^7.0 || ^5.3"
+        "php": ">=5.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     },
     "suggest": {
         "graphp/graphviz": "GraphViz graph drawing / DOT output",

phpunit.xml.dist

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<!-- 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="Graph Test Suite">
+        <testsuite name="Graph test suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

phpunit.xml.legacy

@@ -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="Graph test suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/Exception/NegativeCycleException.php

@@ -14,8 +14,13 @@ class NegativeCycleException extends UnexpectedValueException implements Graph\E
      */
     private $cycle;
 
-    public function __construct($message, $code = NULL, $previous = NULL, Walk $cycle)
+    public function __construct($message, $code = NULL, $previous = NULL, Walk $cycle = null)
     {
+        // $cycle is required, but required argument may not appear after option arguments as of PHP 8
+        if ($cycle === null) {
+            throw new \InvalidArgumentException('Missing required cycle');
+        }
+
         parent::__construct($message, $code, $previous);
         $this->cycle = $cycle;
     }

tests/Edge/EdgeAttributesTest.php

@@ -14,7 +14,10 @@ class EdgeAttributesTest extends TestCase
      */
     private $edge;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpGraph()
     {
 
         $graph = new Graph();
@@ -40,61 +43,49 @@ public function testCanSetFlowBeforeCapacity()
         $this->assertEquals(null, $this->edge->getCapacityRemaining());
     }
 
-    /**
-     * @expectedException RangeException
-     */
     public function testFlowMustNotExceedCapacity()
     {
         $this->edge->setCapacity(20);
+
+        $this->setExpectedException('RangeException');
         $this->edge->setFlow(100);
     }
 
-    /**
-     * @expectedException RangeException
-     */
     public function testCapacityMustBeGreaterThanFlow()
     {
         $this->edge->setFlow(100);
+
+        $this->setExpectedException('RangeException');
         $this->edge->setCapacity(20);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testWeightMustBeNumeric()
     {
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->setWeight("10");
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testCapacityMustBeNumeric()
     {
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->setCapacity("10");
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testCapacityMustBePositive()
     {
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->setCapacity(-10);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testFlowMustBeNumeric()
     {
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->setFlow("10");
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testFlowMustBePositive()
     {
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->setFlow(-10);
     }
 }

tests/Edge/EdgeBaseTest.php

@@ -25,7 +25,10 @@ abstract protected function createEdge();
      */
     abstract protected function createEdgeLoop();
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpGraph()
     {
         $this->graph = new Graph();
         $this->v1 = $this->graph->createVertex(1);
@@ -53,21 +56,19 @@ public function testEdgeStartVertex()
         $this->assertFalse($this->edge->hasVertexTarget($v3));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEdgeFromInvalid()
     {
         $v3 = $this->graph->createVertex(3);
+
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->getVertexFromTo($v3);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEdgeToInvalid()
     {
         $v3 = $this->graph->createVertex(3);
+
+        $this->setExpectedException('InvalidArgumentException');
         $this->edge->getVertexToFrom($v3);
     }
 

tests/Exception/NegativeCycleExceptionTest.php

@@ -18,4 +18,10 @@ public function testConstructor()
         $this->assertEquals('test', $exception->getMessage());
         $this->assertEquals($cycle, $exception->getCycle());
     }
+
+    public function testConstructorThrowsWhenNoCycleIsGiven()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        new NegativeCycleException('test');
+    }
 }