Remove PHP 5 specific exception handling from lang.Throwable::wrap()

ChangeLog.md

@@ -5,7 +5,9 @@ XP Framework Core ChangeLog
 
 ### Features
 
-* Suppress *implicitly nullable parameter types* deprecation warning as
+* Removed PHP 5 specific exception handling from `lang.Throwable::wrap()`
+  (@thekid)
+* Suppressed *implicitly nullable parameter types* deprecation warning as
   there is no way of fixing these syntactically as long as we support
   PHP 7.0. See issue #336 and xp-framework/rfc#343
   (@thekid)

src/main/php/lang/Throwable.class.php

@@ -37,17 +37,13 @@ public function __construct($message, $cause= null, $fill= true) {
   /**
    * Wraps an exception inside a throwable
    *
-   * @param  lang.Throwable|php.Throwable|php.Exception $e
+   * @param  lang.Throwable|php.Throwable $e
    * @return self
    * @throws lang.IllegalArgumentException
    */
   public static function wrap($e): self {
     if ($e instanceof self) {
       return $e;
-    } else if ($e instanceof \BadMethodCallException) {
-      $wrapped= new Error($e->getMessage(), $e->getPrevious(), false);
-    } else if ($e instanceof \Exception) {
-      $wrapped= new XPException($e->getMessage(), $e->getPrevious(), false);
     } else if ($e instanceof \Throwable) {
       $wrapped= new Error($e->getMessage(), $e->getPrevious(), false);
     } else {

src/test/php/lang/unittest/ExceptionsTest.class.php

@@ -2,7 +2,6 @@
 
 use io\streams\{MemoryOutputStream, Streams};
 use lang\{Error, IllegalArgumentException, Throwable, XPClass, XPException};
-use test\verify\Runtime;
 use test\{Action, Assert, Expect, Test};
 
 class ExceptionsTest {
@@ -132,13 +131,7 @@ public function wrap_xp_exceptions() {
   }
 
   #[Test]
-  public function wrap_php5_exceptions() {
-    $e= new \Exception('Test');
-    Assert::instance(XPException::class, Throwable::wrap($e));
-  }
-
-  #[Test, Runtime(php: '>=7.0.0')]
-  public function wrap_php7_exceptions() {
+  public function wrap_php_exceptions() {
     $e= new \TypeError('Test');
     Assert::instance(Error::class, Throwable::wrap($e));
   }