push constructor back into trait for now

src-run · Sep 26, 2016 · f0686c7 · f0686c7
1 parent ce26806
commit f0686c7
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 56 deletions.
diff --git a/composer.json b/composer.json
@@ -18,11 +18,9 @@
       "role": "Project Lead"
     }
   ],
-  "require" : {
-    "php"                                 : "~5.6 || ~7.0",
-    "src-run/augustus-polyfill-library"   : "~0.6,<0.7",
-    "src-run/augustus-reflection-library" : "~0.6,<0.7",
-    "src-run/augustus-utility-library"    : "~0.6,<0.7"
+  "require": {
+    "php": "~7.0",
+    "src-run/augustus-utility-library": "~0.6,<0.7"
   },
   "require-dev": {
     "codacy/coverage": "~1.0",

diff --git a/lib/BadFunctionCallException.php b/lib/BadFunctionCallException.php
@@ -17,15 +17,6 @@
 class BadFunctionCallException extends \BadFunctionCallException implements ExceptionInterface
 {
     use ExceptionTrait;
-
-    /**
-     * @param null|string $message
-     * @param mixed       ...$parameters
-     */
-    final public function __construct($message = null, ...$parameters)
-    {
-        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
-    }
 }
 
 /* EOF */
diff --git a/lib/Exception.php b/lib/Exception.php
@@ -17,15 +17,6 @@
 class Exception extends \Exception implements ExceptionInterface
 {
     use ExceptionTrait;
-
-    /**
-     * @param null|string $message
-     * @param mixed       ...$parameters
-     */
-    final public function __construct($message = null, ...$parameters)
-    {
-        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
-    }
 }
 
 /* EOF */
diff --git a/lib/ExceptionInterface.php b/lib/ExceptionInterface.php
@@ -4,7 +4,6 @@
  * This file is part of the `src-run/augustus-exception-library` project.
  *
  * (c) Rob Frawley 2nd <rmf@src.run>
- * (c) Scribe Inc      <scr@src.run>
  *
  * For the full copyright and license information, please view the LICENSE.md
  * file that was distributed with this source code.

diff --git a/lib/ExceptionTrait.php b/lib/ExceptionTrait.php
@@ -23,6 +23,15 @@ trait ExceptionTrait
      */
     protected $attributes = [];
 
+    /**
+     * @param null|string $message
+     * @param mixed       ...$parameters
+     */
+    public function __construct($message = null, ...$parameters)
+    {
+        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
+    }
+
     /**
      * @param null|string $message
      * @param mixed       ...$parameters

diff --git a/lib/InvalidArgumentException.php b/lib/InvalidArgumentException.php
@@ -17,15 +17,6 @@
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
     use ExceptionTrait;
-
-    /**
-     * @param null|string $message
-     * @param mixed       ...$parameters
-     */
-    final public function __construct($message = null, ...$parameters)
-    {
-        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
-    }
 }
 
 /* EOF */
diff --git a/lib/LogicException.php b/lib/LogicException.php
@@ -17,15 +17,6 @@
 class LogicException extends \LogicException implements ExceptionInterface
 {
     use ExceptionTrait;
-
-    /**
-     * @param null|string $message
-     * @param mixed       ...$parameters
-     */
-    final public function __construct($message = null, ...$parameters)
-    {
-        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
-    }
 }
 
 /* EOF */
diff --git a/lib/RuntimeException.php b/lib/RuntimeException.php
@@ -17,15 +17,6 @@
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
     use ExceptionTrait;
-
-    /**
-     * @param null|string $message
-     * @param mixed       ...$parameters
-     */
-    final public function __construct($message = null, ...$parameters)
-    {
-        parent::__construct($this->compileMessage($message, $parameters), 0, $this->filterThrowables($parameters));
-    }
 }
 
 /* EOF */
diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
@@ -32,7 +32,7 @@ private function getException($message = 'A test exception', array $replacements
     public function testDefaults()
     {
         $exception = $this->getException('A %s.', ['message']);
-        $this->assertEquals('A message.', $exception->getMessage());
+        $this->assertSame('A message.', $exception->getMessage());
 
         $exception = $this->getException();
         $this->assertNotNull($exception->getMessage());
@@ -69,16 +69,16 @@ public function testTypeQualified()
     public function testCompileMessage()
     {
         $exception = $this->getException('A %s with number: "%d"', ['string', 10]);
-        $this->assertEquals('A string with number: "10"', $exception->getMessage());
+        $this->assertSame('A string with number: "10"', $exception->getMessage());
 
         $exception->setMessage('Second string with number: "%d"', 100);
-        $this->assertEquals('Second string with number: "100"', $exception->getMessage());
+        $this->assertSame('Second string with number: "100"', $exception->getMessage());
 
         $exception->setMessage('Second string with number "%04d" and undefined string "%s"', 100);
-        $this->assertEquals('Second string with number "0100" and undefined string "<string:undefined>"', $exception->getMessage());
+        $this->assertSame('Second string with number "0100" and undefined string "<string:undefined>"', $exception->getMessage());
 
         $exception->setMessage('Second string with undefined number "%04d" and undefined string "%s"');
-        $this->assertEquals('Second string with undefined number "<integer:undefined>" and undefined string "<string:undefined>"', $exception->getMessage());
+        $this->assertSame('Second string with undefined number "<integer:undefined>" and undefined string "<string:undefined>"', $exception->getMessage());
     }
 
     public function testCreate()