This package will be developed for PHP 7.x only.

Author: prwater

.travis.yml

@@ -1,10 +1,7 @@
 language: php
 php:
-  - '5.4'
-  - '5.5'
-  - '5.6'
   - '7.0'
-  - hhvm
+  - '7.1'
   - nightly
 
 install:

build.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="php-affirm" default="build" basedir=".">
+<project name="php-exception" default="build" basedir=".">
     <target name="build">
     </target>
 
+    <!-- Run composer update -->
+    <target name="update">
+        <exec command="composer update" checkreturn="true" passthru="true"/>
+    </target>
+
     <!-- Runs ApiGen -->
     <target name="apigen">
         <exec command="apigen generate --todo --tree --source src --destination doc" passthru="true" checkreturn="true"/>

composer.json

@@ -2,22 +2,28 @@
   "name": "setbased/exception",
   "description": "Exceptions with format string",
   "keywords": [
-    "Exception", "Format"
+    "Exception",
+    "Format"
   ],
   "type": "library",
   "license": "MIT",
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.0.0"
   },
   "require-dev": {
-    "phing/phing": "2.*",
-    "phpunit/phpunit": ">=4.0 <6.0"
+    "phing/phing": "^2.0.0",
+    "phpunit/phpunit": "^6.0.0"
   },
   "autoload": {
     "psr-4": {
       "SetBased\\Exception\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "SetBased\\Exception\\Test\\": "test/"
+    }
+  },
   "config": {
     "bin-dir": "bin"
   }

test/ErrorExceptionTest.php

@@ -1,9 +1,14 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
+namespace SetBased\Exception\Test;
+
+use PHPUnit\Framework\TestCase;
 use SetBased\Exception\ErrorException;
 
-//----------------------------------------------------------------------------------------------------------------------
-class ErrorExceptionTest extends PHPUnit_Framework_TestCase
+/**
+ * Test cases for class ErrorException.
+ */
+class ErrorExceptionTest extends TestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -17,7 +22,7 @@ public function test1()
     }
     catch (ErrorException $e)
     {
-      $this->assertSame('PHP Warning', $e->getName());
+      self::assertSame('PHP Warning', $e->getName());
     }
   }
 
@@ -33,7 +38,7 @@ public function test2()
     }
     catch (ErrorException $e)
     {
-      $this->assertSame('Error', $e->getName());
+      self::assertSame('Error', $e->getName());
     }
   }
 

test/FallenExceptionTest.php

@@ -1,9 +1,14 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
+namespace SetBased\Exception\Test;
+
+use PHPUnit\Framework\TestCase;
 use SetBased\Exception\FallenException;
 
-//----------------------------------------------------------------------------------------------------------------------
-class FallenExceptionTest extends PHPUnit_Framework_TestCase
+/**
+ * Test cases for class ErrorException.
+ */
+class FallenExceptionTest extends TestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
   public function testName()
@@ -12,11 +17,11 @@ public function testName()
     {
       throw new FallenException('foo', 'bar');
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertContains('foo', $e->getMessage());
-      $this->assertContains('bar', $e->getMessage());
-      $this->assertInstanceOf('\RuntimeException', $e);
+      self::assertContains('foo', $e->getMessage());
+      self::assertContains('bar', $e->getMessage());
+      self::assertInstanceOf('\RuntimeException', $e);
     }
   }
 

test/FormattedExceptionTestBase.php

@@ -1,9 +1,14 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
+namespace SetBased\Exception\Test;
+
+use PHPUnit\Framework\TestCase;
 use SetBased\Exception\NamedException;
 
-//----------------------------------------------------------------------------------------------------------------------
-class FormattedExceptionTestBase extends PHPUnit_Framework_TestCase
+/**
+ * Test cases for class FormattedException.
+ */
+class FormattedExceptionTestBase extends TestCase
 {
   //--------------------------------------------------------------------------------------------------------------------
   static $class;
@@ -27,10 +32,10 @@ public function testName()
 
       throw new self::$class([$num], $format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
       /** @var $e NamedException */
-      $this->assertSame(self::$name, $e->getName());
+      self::assertSame(self::$name, $e->getName());
     }
   }
 
@@ -49,10 +54,10 @@ public function testCode()
 
       throw new self::$class([$num], $format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertSame('There are 5 monkeys in the tree', $e->getMessage());
-      $this->assertSame($num, $e->getCode());
+      self::assertSame('There are 5 monkeys in the tree', $e->getMessage());
+      self::assertSame($num, $e->getCode());
     }
   }
 
@@ -71,9 +76,9 @@ public function testFormatting()
 
       throw new self::$class($format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertSame('There are 5 monkeys in the tree', $e->getMessage());
+      self::assertSame('There are 5 monkeys in the tree', $e->getMessage());
     }
   }
 
@@ -93,10 +98,10 @@ public function testPrevious()
 
       throw new self::$class([$previous], $format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertSame('There are 5 monkeys in the tree', $e->getMessage());
-      $this->assertSame($previous, $e->getPrevious());
+      self::assertSame('There are 5 monkeys in the tree', $e->getMessage());
+      self::assertSame($previous, $e->getPrevious());
     }
   }
 
@@ -116,11 +121,11 @@ public function testCodePrevious()
 
       throw new self::$class([$num, $previous], $format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertSame('There are 5 monkeys in the tree', $e->getMessage());
-      $this->assertSame($previous, $e->getPrevious());
-      $this->assertSame($num, $e->getCode());
+      self::assertSame('There are 5 monkeys in the tree', $e->getMessage());
+      self::assertSame($previous, $e->getPrevious());
+      self::assertSame($num, $e->getCode());
     }
   }
 
@@ -140,11 +145,11 @@ public function testPreviousCode()
 
       throw new self::$class([$previous, $num], $format, $num, $location);
     }
-    catch (Exception $e)
+    catch (\Exception $e)
     {
-      $this->assertSame('There are 5 monkeys in the tree', $e->getMessage());
-      $this->assertSame($previous, $e->getPrevious());
-      $this->assertSame($num, $e->getCode());
+      self::assertSame('There are 5 monkeys in the tree', $e->getMessage());
+      self::assertSame($previous, $e->getPrevious());
+      self::assertSame($num, $e->getCode());
     }
   }
 

test/LogicExceptionTest.php renamed to test/LogicFormattedExceptionTest.php

@@ -1,6 +1,11 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-class LogicFormattedExceptionTest extends \FormattedExceptionTestBase
+namespace SetBased\Exception\Test;
+
+/**
+ * Test case for class LogicException.
+ */
+class LogicFormattedExceptionTest extends FormattedExceptionTestBase
 {
   //--------------------------------------------------------------------------------------------------------------------
   public function setUp()

test/RuntimeExceptionTest.php renamed to test/RuntimeFormattedExceptionTest.php

@@ -1,14 +1,19 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-class RuntimeFormattedExceptionTest extends \FormattedExceptionTestBase
+namespace SetBased\Exception\Test;
+
+/**
+ * Test cases for class RuntimeException.
+ */
+class RuntimeFormattedExceptionTest extends FormattedExceptionTestBase
 {
   //--------------------------------------------------------------------------------------------------------------------
   public function setUp()
   {
     parent::setUp();
 
     self::$class = '\SetBased\Exception\RuntimeException';
-    self::$name = 'Error';
+    self::$name  = 'Error';
   }
 
   //--------------------------------------------------------------------------------------------------------------------

test/bootstrap.php

@@ -3,6 +3,5 @@
 date_default_timezone_set( 'Europe/Amsterdam' );
 
 require_once( __DIR__.'/../vendor/autoload.php' );
-require_once('FormattedExceptionTestBase.php' );
 
 //----------------------------------------------------------------------------------------------------------------------