Merge pull request #170 from Kharhamel/fix/exception

fixed incorrect excecption creation

generated/Exceptions/ApacheException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApacheException extends \Exception implements SafeExceptionInterface
+class ApacheException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ApcException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApcException extends \Exception implements SafeExceptionInterface
+class ApcException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ApcuException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApcuException extends \Exception implements SafeExceptionInterface
+class ApcuException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ArrayException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ArrayException extends \Exception implements SafeExceptionInterface
+class ArrayException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/Bzip2Exception.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class Bzip2Exception extends \Exception implements SafeExceptionInterface
+class Bzip2Exception extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ClassobjException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ClassobjException extends \Exception implements SafeExceptionInterface
+class ClassobjException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ComException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ComException extends \Exception implements SafeExceptionInterface
+class ComException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/CubridException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class CubridException extends \Exception implements SafeExceptionInterface
+class CubridException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/DatetimeException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class DatetimeException extends \Exception implements SafeExceptionInterface
+class DatetimeException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/DirException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class DirException extends \Exception implements SafeExceptionInterface
+class DirException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/EioException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class EioException extends \Exception implements SafeExceptionInterface
+class EioException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ErrorfuncException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ErrorfuncException extends \Exception implements SafeExceptionInterface
+class ErrorfuncException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ExecException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ExecException extends \Exception implements SafeExceptionInterface
+class ExecException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FileinfoException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FileinfoException extends \Exception implements SafeExceptionInterface
+class FileinfoException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FilesystemException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FilesystemException extends \Exception implements SafeExceptionInterface
+class FilesystemException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FilterException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FilterException extends \Exception implements SafeExceptionInterface
+class FilterException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FpmException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FpmException extends \Exception implements SafeExceptionInterface
+class FpmException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FtpException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FtpException extends \Exception implements SafeExceptionInterface
+class FtpException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/FunchandException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class FunchandException extends \Exception implements SafeExceptionInterface
+class FunchandException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/GmpException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class GmpException extends \Exception implements SafeExceptionInterface
+class GmpException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/GnupgException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class GnupgException extends \Exception implements SafeExceptionInterface
+class GnupgException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/HashException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class HashException extends \Exception implements SafeExceptionInterface
+class HashException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/IbaseException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class IbaseException extends \Exception implements SafeExceptionInterface
+class IbaseException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/IbmDb2Exception.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class IbmDb2Exception extends \Exception implements SafeExceptionInterface
+class IbmDb2Exception extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/IconvException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class IconvException extends \Exception implements SafeExceptionInterface
+class IconvException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ImageException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ImageException extends \Exception implements SafeExceptionInterface
+class ImageException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/ImapException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class ImapException extends \Exception implements SafeExceptionInterface
+class ImapException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }

generated/Exceptions/InfoException.php

@@ -1,10 +1,11 @@
 <?php
 namespace Safe\Exceptions;
 
-class InfoException extends \Exception implements SafeExceptionInterface
+class InfoException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\json_last_error_msg(), \json_last_error());
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
     }
 }