diff --git a/composer.json b/composer.json
index 506a2583..12b1f30b 100644
--- a/composer.json
+++ b/composer.json
@@ -103,8 +103,8 @@
         "php": ">=7.1"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.10.3",
-        "thecodingmachine/phpstan-strict-rules": "^0.10.3",
+        "phpstan/phpstan": "^0.12",
+        "thecodingmachine/phpstan-strict-rules": "^0.12",
         "squizlabs/php_codesniffer": "^3.2"
     },
     "scripts": {
diff --git a/generated/Exceptions/ApacheException.php b/generated/Exceptions/ApacheException.php
index aedca197..c5c8895e 100644
--- a/generated/Exceptions/ApacheException.php
+++ b/generated/Exceptions/ApacheException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApacheException extends AbstractSafeException
+class ApacheException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ApcException.php b/generated/Exceptions/ApcException.php
index 1c20fb00..926104bd 100644
--- a/generated/Exceptions/ApcException.php
+++ b/generated/Exceptions/ApcException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApcException extends AbstractSafeException
+class ApcException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ApcuException.php b/generated/Exceptions/ApcuException.php
index af5b400b..bd4c2ddd 100644
--- a/generated/Exceptions/ApcuException.php
+++ b/generated/Exceptions/ApcuException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ApcuException extends AbstractSafeException
+class ApcuException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ArrayException.php b/generated/Exceptions/ArrayException.php
index 6db6b88e..72f96a6f 100644
--- a/generated/Exceptions/ArrayException.php
+++ b/generated/Exceptions/ArrayException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ArrayException extends AbstractSafeException
+class ArrayException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/Bzip2Exception.php b/generated/Exceptions/Bzip2Exception.php
index 958c75ba..222363c4 100644
--- a/generated/Exceptions/Bzip2Exception.php
+++ b/generated/Exceptions/Bzip2Exception.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class Bzip2Exception extends AbstractSafeException
+class Bzip2Exception extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ClassobjException.php b/generated/Exceptions/ClassobjException.php
index 8b176c47..dab4cb87 100644
--- a/generated/Exceptions/ClassobjException.php
+++ b/generated/Exceptions/ClassobjException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ClassobjException extends AbstractSafeException
+class ClassobjException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ComException.php b/generated/Exceptions/ComException.php
index e21e6dad..a32273b2 100644
--- a/generated/Exceptions/ComException.php
+++ b/generated/Exceptions/ComException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ComException extends AbstractSafeException
+class ComException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/CubridException.php b/generated/Exceptions/CubridException.php
index b096f9e2..697263c4 100644
--- a/generated/Exceptions/CubridException.php
+++ b/generated/Exceptions/CubridException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class CubridException extends AbstractSafeException
+class CubridException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/DatetimeException.php b/generated/Exceptions/DatetimeException.php
index 8b368b3c..6dc35412 100644
--- a/generated/Exceptions/DatetimeException.php
+++ b/generated/Exceptions/DatetimeException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class DatetimeException extends AbstractSafeException
+class DatetimeException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/DirException.php b/generated/Exceptions/DirException.php
index 1a36cd2f..d7ffb2da 100644
--- a/generated/Exceptions/DirException.php
+++ b/generated/Exceptions/DirException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class DirException extends AbstractSafeException
+class DirException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/EioException.php b/generated/Exceptions/EioException.php
index ba80cdd2..eacd5c26 100644
--- a/generated/Exceptions/EioException.php
+++ b/generated/Exceptions/EioException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class EioException extends AbstractSafeException
+class EioException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ErrorfuncException.php b/generated/Exceptions/ErrorfuncException.php
index 19f2dab3..01052bc4 100644
--- a/generated/Exceptions/ErrorfuncException.php
+++ b/generated/Exceptions/ErrorfuncException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ErrorfuncException extends AbstractSafeException
+class ErrorfuncException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ExecException.php b/generated/Exceptions/ExecException.php
index 2c1dfa79..0bae866c 100644
--- a/generated/Exceptions/ExecException.php
+++ b/generated/Exceptions/ExecException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ExecException extends AbstractSafeException
+class ExecException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FileinfoException.php b/generated/Exceptions/FileinfoException.php
index 8efccc81..ab0ffa9b 100644
--- a/generated/Exceptions/FileinfoException.php
+++ b/generated/Exceptions/FileinfoException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FileinfoException extends AbstractSafeException
+class FileinfoException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FilesystemException.php b/generated/Exceptions/FilesystemException.php
index 271b0f55..23a784e9 100644
--- a/generated/Exceptions/FilesystemException.php
+++ b/generated/Exceptions/FilesystemException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FilesystemException extends AbstractSafeException
+class FilesystemException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FilterException.php b/generated/Exceptions/FilterException.php
index 1706aa26..698d823d 100644
--- a/generated/Exceptions/FilterException.php
+++ b/generated/Exceptions/FilterException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FilterException extends AbstractSafeException
+class FilterException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FpmException.php b/generated/Exceptions/FpmException.php
index acb3ec4b..e46827b6 100644
--- a/generated/Exceptions/FpmException.php
+++ b/generated/Exceptions/FpmException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FpmException extends AbstractSafeException
+class FpmException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FtpException.php b/generated/Exceptions/FtpException.php
index 763c7dd9..45600adc 100644
--- a/generated/Exceptions/FtpException.php
+++ b/generated/Exceptions/FtpException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FtpException extends AbstractSafeException
+class FtpException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/FunchandException.php b/generated/Exceptions/FunchandException.php
index abe8e5c9..e9f491cd 100644
--- a/generated/Exceptions/FunchandException.php
+++ b/generated/Exceptions/FunchandException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class FunchandException extends AbstractSafeException
+class FunchandException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/GmpException.php b/generated/Exceptions/GmpException.php
index 69a999f8..91d92fea 100644
--- a/generated/Exceptions/GmpException.php
+++ b/generated/Exceptions/GmpException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class GmpException extends AbstractSafeException
+class GmpException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/GnupgException.php b/generated/Exceptions/GnupgException.php
index aac15faf..816c9d45 100644
--- a/generated/Exceptions/GnupgException.php
+++ b/generated/Exceptions/GnupgException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class GnupgException extends AbstractSafeException
+class GnupgException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/HashException.php b/generated/Exceptions/HashException.php
index 51a04a5a..1a5cafe5 100644
--- a/generated/Exceptions/HashException.php
+++ b/generated/Exceptions/HashException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class HashException extends AbstractSafeException
+class HashException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/IbaseException.php b/generated/Exceptions/IbaseException.php
index f229406a..47540053 100644
--- a/generated/Exceptions/IbaseException.php
+++ b/generated/Exceptions/IbaseException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class IbaseException extends AbstractSafeException
+class IbaseException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/IbmDb2Exception.php b/generated/Exceptions/IbmDb2Exception.php
index e817dc5b..65005787 100644
--- a/generated/Exceptions/IbmDb2Exception.php
+++ b/generated/Exceptions/IbmDb2Exception.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class IbmDb2Exception extends AbstractSafeException
+class IbmDb2Exception extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/IconvException.php b/generated/Exceptions/IconvException.php
index 0c46f0fd..68a3d484 100644
--- a/generated/Exceptions/IconvException.php
+++ b/generated/Exceptions/IconvException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class IconvException extends AbstractSafeException
+class IconvException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ImageException.php b/generated/Exceptions/ImageException.php
index c634454b..ad3c816c 100644
--- a/generated/Exceptions/ImageException.php
+++ b/generated/Exceptions/ImageException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ImageException extends AbstractSafeException
+class ImageException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ImapException.php b/generated/Exceptions/ImapException.php
index d75665fd..27b99cb3 100644
--- a/generated/Exceptions/ImapException.php
+++ b/generated/Exceptions/ImapException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ImapException extends AbstractSafeException
+class ImapException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/InfoException.php b/generated/Exceptions/InfoException.php
index d69f956c..25a00a6f 100644
--- a/generated/Exceptions/InfoException.php
+++ b/generated/Exceptions/InfoException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class InfoException extends AbstractSafeException
+class InfoException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/IngresiiException.php b/generated/Exceptions/IngresiiException.php
index e3a94c0a..43804d59 100644
--- a/generated/Exceptions/IngresiiException.php
+++ b/generated/Exceptions/IngresiiException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class IngresiiException extends AbstractSafeException
+class IngresiiException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/InotifyException.php b/generated/Exceptions/InotifyException.php
index 7cdca999..33bfc6a3 100644
--- a/generated/Exceptions/InotifyException.php
+++ b/generated/Exceptions/InotifyException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class InotifyException extends AbstractSafeException
+class InotifyException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/LdapException.php b/generated/Exceptions/LdapException.php
index ab2db06e..da6e11bc 100644
--- a/generated/Exceptions/LdapException.php
+++ b/generated/Exceptions/LdapException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class LdapException extends AbstractSafeException
+class LdapException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/LibeventException.php b/generated/Exceptions/LibeventException.php
index cf2983f3..3417bf20 100644
--- a/generated/Exceptions/LibeventException.php
+++ b/generated/Exceptions/LibeventException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class LibeventException extends AbstractSafeException
+class LibeventException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/LibxmlException.php b/generated/Exceptions/LibxmlException.php
index d94f3638..2b81f466 100644
--- a/generated/Exceptions/LibxmlException.php
+++ b/generated/Exceptions/LibxmlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class LibxmlException extends AbstractSafeException
+class LibxmlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/LzfException.php b/generated/Exceptions/LzfException.php
index 032c115d..628302bd 100644
--- a/generated/Exceptions/LzfException.php
+++ b/generated/Exceptions/LzfException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class LzfException extends AbstractSafeException
+class LzfException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MailparseException.php b/generated/Exceptions/MailparseException.php
index 84e604e7..42e1e60a 100644
--- a/generated/Exceptions/MailparseException.php
+++ b/generated/Exceptions/MailparseException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MailparseException extends AbstractSafeException
+class MailparseException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MbstringException.php b/generated/Exceptions/MbstringException.php
index 0e7cda4b..db3a5d45 100644
--- a/generated/Exceptions/MbstringException.php
+++ b/generated/Exceptions/MbstringException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MbstringException extends AbstractSafeException
+class MbstringException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MiscException.php b/generated/Exceptions/MiscException.php
index 8e37ec0f..27b64739 100644
--- a/generated/Exceptions/MiscException.php
+++ b/generated/Exceptions/MiscException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MiscException extends AbstractSafeException
+class MiscException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MsqlException.php b/generated/Exceptions/MsqlException.php
index 94d0a396..5794893b 100644
--- a/generated/Exceptions/MsqlException.php
+++ b/generated/Exceptions/MsqlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MsqlException extends AbstractSafeException
+class MsqlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MssqlException.php b/generated/Exceptions/MssqlException.php
index 916f837d..e00f1e2a 100644
--- a/generated/Exceptions/MssqlException.php
+++ b/generated/Exceptions/MssqlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MssqlException extends AbstractSafeException
+class MssqlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MysqlException.php b/generated/Exceptions/MysqlException.php
index 15e384d4..b6640ec6 100644
--- a/generated/Exceptions/MysqlException.php
+++ b/generated/Exceptions/MysqlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MysqlException extends AbstractSafeException
+class MysqlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MysqliException.php b/generated/Exceptions/MysqliException.php
index d43e694a..22d41dc3 100644
--- a/generated/Exceptions/MysqliException.php
+++ b/generated/Exceptions/MysqliException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MysqliException extends AbstractSafeException
+class MysqliException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MysqlndMsException.php b/generated/Exceptions/MysqlndMsException.php
index 4d531e95..9db20ef7 100644
--- a/generated/Exceptions/MysqlndMsException.php
+++ b/generated/Exceptions/MysqlndMsException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MysqlndMsException extends AbstractSafeException
+class MysqlndMsException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/MysqlndQcException.php b/generated/Exceptions/MysqlndQcException.php
index d8382e39..6c798c11 100644
--- a/generated/Exceptions/MysqlndQcException.php
+++ b/generated/Exceptions/MysqlndQcException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class MysqlndQcException extends AbstractSafeException
+class MysqlndQcException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/NetworkException.php b/generated/Exceptions/NetworkException.php
index 1913c87d..4ce13a02 100644
--- a/generated/Exceptions/NetworkException.php
+++ b/generated/Exceptions/NetworkException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class NetworkException extends AbstractSafeException
+class NetworkException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/Oci8Exception.php b/generated/Exceptions/Oci8Exception.php
index 85431021..8ead8aa2 100644
--- a/generated/Exceptions/Oci8Exception.php
+++ b/generated/Exceptions/Oci8Exception.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class Oci8Exception extends AbstractSafeException
+class Oci8Exception extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/OpcacheException.php b/generated/Exceptions/OpcacheException.php
index 80c56bba..912e4b93 100644
--- a/generated/Exceptions/OpcacheException.php
+++ b/generated/Exceptions/OpcacheException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class OpcacheException extends AbstractSafeException
+class OpcacheException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/OutcontrolException.php b/generated/Exceptions/OutcontrolException.php
index 1c3336b6..096e7f46 100644
--- a/generated/Exceptions/OutcontrolException.php
+++ b/generated/Exceptions/OutcontrolException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class OutcontrolException extends AbstractSafeException
+class OutcontrolException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PasswordException.php b/generated/Exceptions/PasswordException.php
index 1760359f..9150775a 100644
--- a/generated/Exceptions/PasswordException.php
+++ b/generated/Exceptions/PasswordException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PasswordException extends AbstractSafeException
+class PasswordException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PcntlException.php b/generated/Exceptions/PcntlException.php
index 33ab57be..1c150b19 100644
--- a/generated/Exceptions/PcntlException.php
+++ b/generated/Exceptions/PcntlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PcntlException extends AbstractSafeException
+class PcntlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PdfException.php b/generated/Exceptions/PdfException.php
index b96d682b..7ef23cbc 100644
--- a/generated/Exceptions/PdfException.php
+++ b/generated/Exceptions/PdfException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PdfException extends AbstractSafeException
+class PdfException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PgsqlException.php b/generated/Exceptions/PgsqlException.php
index b48f2fc6..bdd5533e 100644
--- a/generated/Exceptions/PgsqlException.php
+++ b/generated/Exceptions/PgsqlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PgsqlException extends AbstractSafeException
+class PgsqlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PosixException.php b/generated/Exceptions/PosixException.php
index a606432d..3add4e92 100644
--- a/generated/Exceptions/PosixException.php
+++ b/generated/Exceptions/PosixException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PosixException extends AbstractSafeException
+class PosixException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PsException.php b/generated/Exceptions/PsException.php
index 8dba2552..9cb43539 100644
--- a/generated/Exceptions/PsException.php
+++ b/generated/Exceptions/PsException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PsException extends AbstractSafeException
+class PsException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/PspellException.php b/generated/Exceptions/PspellException.php
index 43c852bf..8501b391 100644
--- a/generated/Exceptions/PspellException.php
+++ b/generated/Exceptions/PspellException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class PspellException extends AbstractSafeException
+class PspellException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ReadlineException.php b/generated/Exceptions/ReadlineException.php
index b3b1c246..c45ffa15 100644
--- a/generated/Exceptions/ReadlineException.php
+++ b/generated/Exceptions/ReadlineException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ReadlineException extends AbstractSafeException
+class ReadlineException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/RrdException.php b/generated/Exceptions/RrdException.php
index 75f25564..e56f424a 100644
--- a/generated/Exceptions/RrdException.php
+++ b/generated/Exceptions/RrdException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class RrdException extends AbstractSafeException
+class RrdException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SemException.php b/generated/Exceptions/SemException.php
index 141fc68a..f8c90bab 100644
--- a/generated/Exceptions/SemException.php
+++ b/generated/Exceptions/SemException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SemException extends AbstractSafeException
+class SemException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SessionException.php b/generated/Exceptions/SessionException.php
index 775017e0..d56a81a6 100644
--- a/generated/Exceptions/SessionException.php
+++ b/generated/Exceptions/SessionException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SessionException extends AbstractSafeException
+class SessionException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ShmopException.php b/generated/Exceptions/ShmopException.php
index 9f501b46..a0b6e520 100644
--- a/generated/Exceptions/ShmopException.php
+++ b/generated/Exceptions/ShmopException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ShmopException extends AbstractSafeException
+class ShmopException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SimplexmlException.php b/generated/Exceptions/SimplexmlException.php
index 1cb0e022..f80a01ad 100644
--- a/generated/Exceptions/SimplexmlException.php
+++ b/generated/Exceptions/SimplexmlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SimplexmlException extends AbstractSafeException
+class SimplexmlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SocketsException.php b/generated/Exceptions/SocketsException.php
index 37ad98db..1eea63e7 100644
--- a/generated/Exceptions/SocketsException.php
+++ b/generated/Exceptions/SocketsException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SocketsException extends AbstractSafeException
+class SocketsException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SodiumException.php b/generated/Exceptions/SodiumException.php
index ef00ba46..fd64067a 100644
--- a/generated/Exceptions/SodiumException.php
+++ b/generated/Exceptions/SodiumException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SodiumException extends AbstractSafeException
+class SodiumException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SolrException.php b/generated/Exceptions/SolrException.php
index 80673c6e..d395854f 100644
--- a/generated/Exceptions/SolrException.php
+++ b/generated/Exceptions/SolrException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SolrException extends AbstractSafeException
+class SolrException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SplException.php b/generated/Exceptions/SplException.php
index ddf3798f..66386ae1 100644
--- a/generated/Exceptions/SplException.php
+++ b/generated/Exceptions/SplException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SplException extends AbstractSafeException
+class SplException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SqlsrvException.php b/generated/Exceptions/SqlsrvException.php
index f3c42246..b4f2d945 100644
--- a/generated/Exceptions/SqlsrvException.php
+++ b/generated/Exceptions/SqlsrvException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SqlsrvException extends AbstractSafeException
+class SqlsrvException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SsdeepException.php b/generated/Exceptions/SsdeepException.php
index 512420af..ae3c196d 100644
--- a/generated/Exceptions/SsdeepException.php
+++ b/generated/Exceptions/SsdeepException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SsdeepException extends AbstractSafeException
+class SsdeepException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/Ssh2Exception.php b/generated/Exceptions/Ssh2Exception.php
index ea2a2421..cc46b73c 100644
--- a/generated/Exceptions/Ssh2Exception.php
+++ b/generated/Exceptions/Ssh2Exception.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class Ssh2Exception extends AbstractSafeException
+class Ssh2Exception extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/StatsException.php b/generated/Exceptions/StatsException.php
index 267e1d49..1975e968 100644
--- a/generated/Exceptions/StatsException.php
+++ b/generated/Exceptions/StatsException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class StatsException extends AbstractSafeException
+class StatsException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/StreamException.php b/generated/Exceptions/StreamException.php
index e6c33aea..9c42d254 100644
--- a/generated/Exceptions/StreamException.php
+++ b/generated/Exceptions/StreamException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class StreamException extends AbstractSafeException
+class StreamException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/StringsException.php b/generated/Exceptions/StringsException.php
index b5387649..91d8f3b6 100644
--- a/generated/Exceptions/StringsException.php
+++ b/generated/Exceptions/StringsException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class StringsException extends AbstractSafeException
+class StringsException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/SwooleException.php b/generated/Exceptions/SwooleException.php
index d453a3ed..3fbca1f5 100644
--- a/generated/Exceptions/SwooleException.php
+++ b/generated/Exceptions/SwooleException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class SwooleException extends AbstractSafeException
+class SwooleException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/UodbcException.php b/generated/Exceptions/UodbcException.php
index 4a7c29e9..91ef55a6 100644
--- a/generated/Exceptions/UodbcException.php
+++ b/generated/Exceptions/UodbcException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class UodbcException extends AbstractSafeException
+class UodbcException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/UopzException.php b/generated/Exceptions/UopzException.php
index 9903a644..4879da90 100644
--- a/generated/Exceptions/UopzException.php
+++ b/generated/Exceptions/UopzException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class UopzException extends AbstractSafeException
+class UopzException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/UrlException.php b/generated/Exceptions/UrlException.php
index 7f430f08..b85d8c11 100644
--- a/generated/Exceptions/UrlException.php
+++ b/generated/Exceptions/UrlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class UrlException extends AbstractSafeException
+class UrlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/VarException.php b/generated/Exceptions/VarException.php
index 5d1dc4ab..ae0fad74 100644
--- a/generated/Exceptions/VarException.php
+++ b/generated/Exceptions/VarException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class VarException extends AbstractSafeException
+class VarException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/XdiffException.php b/generated/Exceptions/XdiffException.php
index 0f9b279f..98177bce 100644
--- a/generated/Exceptions/XdiffException.php
+++ b/generated/Exceptions/XdiffException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class XdiffException extends AbstractSafeException
+class XdiffException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/XmlException.php b/generated/Exceptions/XmlException.php
index 72b972e6..f8daa64e 100644
--- a/generated/Exceptions/XmlException.php
+++ b/generated/Exceptions/XmlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class XmlException extends AbstractSafeException
+class XmlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/XmlrpcException.php b/generated/Exceptions/XmlrpcException.php
index 11590ec1..420d5bbe 100644
--- a/generated/Exceptions/XmlrpcException.php
+++ b/generated/Exceptions/XmlrpcException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class XmlrpcException extends AbstractSafeException
+class XmlrpcException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/YamlException.php b/generated/Exceptions/YamlException.php
index 55031b67..16fcf005 100644
--- a/generated/Exceptions/YamlException.php
+++ b/generated/Exceptions/YamlException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class YamlException extends AbstractSafeException
+class YamlException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/YazException.php b/generated/Exceptions/YazException.php
index 5359bdbe..a2dd2ce3 100644
--- a/generated/Exceptions/YazException.php
+++ b/generated/Exceptions/YazException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class YazException extends AbstractSafeException
+class YazException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ZipException.php b/generated/Exceptions/ZipException.php
index c86a7415..f6c0e526 100644
--- a/generated/Exceptions/ZipException.php
+++ b/generated/Exceptions/ZipException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ZipException extends AbstractSafeException
+class ZipException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/Exceptions/ZlibException.php b/generated/Exceptions/ZlibException.php
index ec6f0fdc..d67c1dda 100644
--- a/generated/Exceptions/ZlibException.php
+++ b/generated/Exceptions/ZlibException.php
@@ -1,6 +1,10 @@
 <?php
 namespace Safe\Exceptions;
 
-class ZlibException extends AbstractSafeException
+class ZlibException extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
diff --git a/generated/ldap.php b/generated/ldap.php
index bde7dafd..c5535545 100644
--- a/generated/ldap.php
+++ b/generated/ldap.php
@@ -59,14 +59,14 @@ function ldap_add($link_identifier, string $dn, array $entry, array $serverctrls
  * Does the same thing as ldap_bind but returns the LDAP result resource to be parsed with ldap_parse_result.
  *
  * @param resource $link_identifier
- * @param string $bind_rdn
- * @param string $bind_password
+ * @param string|null $bind_rdn
+ * @param string|null $bind_password
  * @param array $serverctrls
  * @return resource Returns an LDAP result identifier.
  * @throws LdapException
  *
  */
-function ldap_bind_ext($link_identifier, string $bind_rdn = null, string $bind_password = null, array $serverctrls = null)
+function ldap_bind_ext($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null, array $serverctrls = null)
 {
     error_clear_last();
     $result = \ldap_bind_ext($link_identifier, $bind_rdn, $bind_password, $serverctrls);
@@ -81,13 +81,13 @@ function ldap_bind_ext($link_identifier, string $bind_rdn = null, string $bind_p
  * Binds to the LDAP directory with specified RDN and password.
  *
  * @param resource $link_identifier An LDAP link identifier, returned by ldap_connect.
- * @param string $bind_rdn
- * @param string $bind_password
+ * @param string|null $bind_rdn
+ * @param string|null $bind_password
  * @param array $serverctrls Array of LDAP Controls to send with the request.
  * @throws LdapException
  *
  */
-function ldap_bind($link_identifier, string $bind_rdn = null, string $bind_password = null, array $serverctrls = null): void
+function ldap_bind($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null, array $serverctrls = null): void
 {
     error_clear_last();
     $result = \ldap_bind($link_identifier, $bind_rdn, $bind_password, $serverctrls);
@@ -254,7 +254,7 @@ function ldap_exop_whoami($link): string
  * @param resource $link An LDAP link identifier, returned by ldap_connect.
  * @param string $reqoid The extended operation request OID. You may use one of LDAP_EXOP_START_TLS, LDAP_EXOP_MODIFY_PASSWD, LDAP_EXOP_REFRESH, LDAP_EXOP_WHO_AM_I, LDAP_EXOP_TURN, or a string with the OID of the operation you want to send.
  * @param string $reqdata The extended operation request data. May be NULL for some operations like LDAP_EXOP_WHO_AM_I, may also need to be BER encoded.
- * @param array $serverctrls Array of LDAP Controls to send with the request.
+ * @param array|null $serverctrls Array of LDAP Controls to send with the request.
  * @param string|null $retdata Will be filled with the extended operation response data if provided.
  * If not provided you may use ldap_parse_exop on the result object
  * later to get this data.
@@ -264,7 +264,7 @@ function ldap_exop_whoami($link): string
  * @throws LdapException
  *
  */
-function ldap_exop($link, string $reqoid, string $reqdata = null, array $serverctrls = null, ?string &$retdata = null, ?string &$retoid = null)
+function ldap_exop($link, string $reqoid, string $reqdata = null, ?array $serverctrls = null, ?string &$retdata = null, ?string &$retoid = null)
 {
     error_clear_last();
     $result = \ldap_exop($link, $reqoid, $reqdata, $serverctrls, $retdata, $retoid);
@@ -1404,7 +1404,7 @@ function ldap_search($link_identifier, string $base_dn, string $filter, array $a
 /**
  * Sets the value of the specified option to be newval.
  *
- * @param resource $link_identifier An LDAP link identifier, returned by ldap_connect.
+ * @param resource|null $link_identifier An LDAP link identifier, returned by ldap_connect.
  * @param int $option The parameter option can be one of:
  *
  *
diff --git a/generated/mbstring.php b/generated/mbstring.php
index 2f0405e5..d28ca09f 100644
--- a/generated/mbstring.php
+++ b/generated/mbstring.php
@@ -418,7 +418,7 @@ function mb_regex_encoding(string $encoding = null)
  * This parameter is not automatically encoded.
  * @param string $subject The subject of the mail.
  * @param string $message The message of the mail.
- * @param string $additional_headers String or array to be inserted at the end of the email header.
+ * @param string|array|null $additional_headers String or array to be inserted at the end of the email header.
  *
  * This is typically used to add extra headers (From, Cc, and Bcc).
  * Multiple extra headers should be separated with a CRLF (\r\n).
@@ -464,7 +464,7 @@ function mb_regex_encoding(string $encoding = null)
  * @throws MbstringException
  *
  */
-function mb_send_mail(string $to, string $subject, string $message, string $additional_headers = null, string $additional_parameter = null): void
+function mb_send_mail(string $to, string $subject, string $message, $additional_headers = null, string $additional_parameter = null): void
 {
     error_clear_last();
     $result = \mb_send_mail($to, $subject, $message, $additional_headers, $additional_parameter);
diff --git a/generated/mysql.php b/generated/mysql.php
index 8372992d..9c9799e4 100644
--- a/generated/mysql.php
+++ b/generated/mysql.php
@@ -190,7 +190,7 @@ function mysql_db_name($result, int $row, $field = null): string
  * will try to create one as if mysql_connect had been called
  * with no arguments. If no connection is found or established, an
  * E_WARNING level error is generated.
- * @return resource Returns a positive MySQL result resource to the query result. The function also returns TRUE/FALSE for
+ * @return resource|bool Returns a positive MySQL result resource to the query result. The function also returns TRUE/FALSE for
  * INSERT/UPDATE/DELETE
  * queries to indicate success/failure.
  * @throws MysqlException
@@ -684,7 +684,7 @@ function mysql_num_rows($result): int
  * will try to create one as if mysql_connect had been called
  * with no arguments. If no connection is found or established, an
  * E_WARNING level error is generated.
- * @return resource For SELECT, SHOW, DESCRIBE, EXPLAIN and other statements returning resultset,
+ * @return resource|bool For SELECT, SHOW, DESCRIBE, EXPLAIN and other statements returning resultset,
  * mysql_query
  * returns a resource on success.
  *
@@ -918,7 +918,7 @@ function mysql_thread_id($link_identifier = null): int
  * will try to create one as if mysql_connect had been called
  * with no arguments. If no connection is found or established, an
  * E_WARNING level error is generated.
- * @return resource For SELECT, SHOW, DESCRIBE or EXPLAIN statements,
+ * @return resource|bool For SELECT, SHOW, DESCRIBE or EXPLAIN statements,
  * mysql_unbuffered_query
  * returns a resource on success.
  *
diff --git a/generator/composer.json b/generator/composer.json
index 13f2d051..05e7d3f3 100644
--- a/generator/composer.json
+++ b/generator/composer.json
@@ -17,8 +17,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^7",
-    "phpstan/phpstan": "^0.11.16",
-    "thecodingmachine/phpstan-strict-rules": "^0.10.3",
+    "phpstan/phpstan": "^0.12",
+    "thecodingmachine/phpstan-strict-rules": "^0.12",
     "squizlabs/php_codesniffer": "^3.2",
     "php-coveralls/php-coveralls": "^2.1"
   },
diff --git a/generator/composer.lock b/generator/composer.lock
index d7e902a0..8a27fd8c 100644
--- a/generator/composer.lock
+++ b/generator/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ee714b0751ee4070fab33e43e6491bcd",
+    "content-hash": "67d69047dcb7c1c66fab69c541961259",
     "packages": [
         {
             "name": "markbaker/complex",
@@ -172,16 +172,16 @@
         },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.9.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "8dea03eaf60a349b6097e4bcad11f894668280df"
+                "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/8dea03eaf60a349b6097e4bcad11f894668280df",
-                "reference": "8dea03eaf60a349b6097e4bcad11f894668280df",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/1648dc9ebef6ebe0c5a172e16cf66732918416e0",
+                "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0",
                 "shasum": ""
             },
             "require": {
@@ -199,19 +199,19 @@
                 "ext-zip": "*",
                 "ext-zlib": "*",
                 "markbaker/complex": "^1.4",
-                "markbaker/matrix": "^1.1",
+                "markbaker/matrix": "^1.2",
                 "php": "^7.1",
                 "psr/simple-cache": "^1.0"
             },
             "require-dev": {
-                "dompdf/dompdf": "^0.8.0",
-                "friendsofphp/php-cs-fixer": "@stable",
+                "dompdf/dompdf": "^0.8.3",
+                "friendsofphp/php-cs-fixer": "^2.16",
                 "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^7.0.0",
-                "phpcompatibility/php-compatibility": "^8.0",
+                "mpdf/mpdf": "^8.0",
+                "phpcompatibility/php-compatibility": "^9.3",
                 "phpunit/phpunit": "^7.5",
-                "squizlabs/php_codesniffer": "^3.3",
-                "tecnickcom/tcpdf": "^6.2"
+                "squizlabs/php_codesniffer": "^3.5",
+                "tecnickcom/tcpdf": "^6.3"
             },
             "suggest": {
                 "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
@@ -227,7 +227,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-2.1-or-later"
+                "MIT"
             ],
             "authors": [
                 {
@@ -261,7 +261,7 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2019-08-17T22:24:35+00:00"
+            "time": "2019-12-01T23:13:51+00:00"
         },
         {
             "name": "psr/container",
@@ -362,27 +362,28 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.3.5",
+            "version": "v4.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "929ddf360d401b958f611d44e726094ab46a7369"
+                "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
-                "reference": "929ddf360d401b958f611d44e726094ab46a7369",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201",
+                "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-                "symfony/service-contracts": "^1.1"
+                "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4",
-                "symfony/event-dispatcher": "<4.3",
+                "symfony/event-dispatcher": "<4.3|>=5",
+                "symfony/lock": "<4.4",
                 "symfony/process": "<3.3"
             },
             "provide": {
@@ -390,12 +391,12 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/event-dispatcher": "^4.3",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0",
-                "symfony/var-dumper": "^4.3"
+                "symfony/lock": "^4.4|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0",
+                "symfony/var-dumper": "^4.3|^5.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -406,7 +407,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -433,20 +434,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2019-10-07T12:36:49+00:00"
+            "time": "2019-12-01T10:06:17+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.5",
+            "version": "v4.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "5e575faa95548d0586f6bedaeabec259714e44d1"
+                "reference": "ce8743441da64c41e2a667b8eb66070444ed911e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1",
-                "reference": "5e575faa95548d0586f6bedaeabec259714e44d1",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e",
+                "reference": "ce8743441da64c41e2a667b8eb66070444ed911e",
                 "shasum": ""
             },
             "require": {
@@ -455,7 +456,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -482,20 +483,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-16T11:29:48+00:00"
+            "time": "2019-11-17T21:56:56+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.12.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
+                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
                 "shasum": ""
             },
             "require": {
@@ -507,7 +508,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -541,20 +542,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2019-11-27T14:18:11+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.12.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
+                "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f",
+                "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f",
                 "shasum": ""
             },
             "require": {
@@ -563,7 +564,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -599,20 +600,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2019-11-27T16:25:15+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.3.5",
+            "version": "v4.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b"
+                "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b",
-                "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/51c0135ef3f44c5803b33dc60e96bf4f77752726",
+                "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726",
                 "shasum": ""
             },
             "require": {
@@ -621,7 +622,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -648,24 +649,24 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-26T21:17:10+00:00"
+            "time": "2019-11-28T13:33:56+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v1.1.7",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
+                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
-                "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
+                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -674,7 +675,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -706,66 +707,22 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-09-17T11:12:18+00:00"
+            "time": "2019-11-18T17:27:11+00:00"
         }
     ],
     "packages-dev": [
-        {
-            "name": "composer/xdebug-handler",
-            "version": "1.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0",
-                "psr/log": "^1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without xdebug.",
-            "keywords": [
-                "Xdebug",
-                "performance"
-            ],
-            "time": "2019-05-27T17:52:04+00:00"
-        },
         {
             "name": "doctrine/instantiator",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
                 "shasum": ""
             },
             "require": {
@@ -808,48 +765,50 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-03-17T17:37:11+00:00"
+            "time": "2019-10-21T16:45:58+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
+                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
             },
             "suggest": {
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.3-dev"
+                    "dev-master": "6.5-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -873,7 +832,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-12-07T18:20:45+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -997,57 +956,6 @@
             ],
             "time": "2019-07-01T23:21:34+00:00"
         },
-        {
-            "name": "jean85/pretty-package-versions",
-            "version": "1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/75c7effcf3f77501d0e0caa75111aff4daa0dd48",
-                "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/package-versions": "^1.2.0",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Jean85\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alessandro Lai",
-                    "email": "alessandro.lai85@gmail.com"
-                }
-            ],
-            "description": "A wrapper for ocramius/package-versions to get pretty versions strings",
-            "keywords": [
-                "composer",
-                "package",
-                "release",
-                "versions"
-            ],
-            "time": "2018-06-13T13:22:40+00:00"
-        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.9.3",
@@ -1096,541 +1004,18 @@
             ],
             "time": "2019-08-09T12:45:53+00:00"
         },
-        {
-            "name": "nette/bootstrap",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/bootstrap.git",
-                "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/bootstrap/zipball/e1075af05c211915e03e0c86542f3ba5433df4a3",
-                "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3",
-                "shasum": ""
-            },
-            "require": {
-                "nette/di": "^3.0",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "latte/latte": "^2.2",
-                "nette/application": "^3.0",
-                "nette/caching": "^3.0",
-                "nette/database": "^3.0",
-                "nette/forms": "^3.0",
-                "nette/http": "^3.0",
-                "nette/mail": "^3.0",
-                "nette/robot-loader": "^3.0",
-                "nette/safe-stream": "^2.2",
-                "nette/security": "^3.0",
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.6"
-            },
-            "suggest": {
-                "nette/robot-loader": "to use Configurator::createRobotLoader()",
-                "tracy/tracy": "to use Configurator::enableTracy()"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🅱 Nette Bootstrap: the simple way to configure and bootstrap your Nette application.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "bootstrapping",
-                "configurator",
-                "nette"
-            ],
-            "time": "2019-03-26T12:59:07+00:00"
-        },
-        {
-            "name": "nette/di",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/di.git",
-                "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/di/zipball/4aff517a1c6bb5c36fa09733d4cea089f529de6d",
-                "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "nette/neon": "^3.0",
-                "nette/php-generator": "^3.2.2",
-                "nette/robot-loader": "^3.2",
-                "nette/schema": "^1.0",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "conflict": {
-                "nette/bootstrap": "<3.0"
-            },
-            "require-dev": {
-                "nette/tester": "^2.2",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ],
-                "files": [
-                    "src/compatibility.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "💎 Nette Dependency Injection Container: Flexible, compiled and full-featured DIC with perfectly usable autowiring and support for all new PHP 7.1 features.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "compiled",
-                "di",
-                "dic",
-                "factory",
-                "ioc",
-                "nette",
-                "static"
-            ],
-            "time": "2019-08-07T12:11:33+00:00"
-        },
-        {
-            "name": "nette/finder",
-            "version": "v2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/finder.git",
-                "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/finder/zipball/14164e1ddd69e9c5f627ff82a10874b3f5bba5fe",
-                "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^2.4 || ~3.0.0",
-                "php": ">=7.1"
-            },
-            "conflict": {
-                "nette/nette": "<2.2"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🔍 Nette Finder: find files and directories with an intuitive API.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "filesystem",
-                "glob",
-                "iterator",
-                "nette"
-            ],
-            "time": "2019-07-11T18:02:17+00:00"
-        },
-        {
-            "name": "nette/neon",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/neon.git",
-                "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/neon/zipball/cbff32059cbdd8720deccf9e9eace6ee516f02eb",
-                "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-iconv": "*",
-                "ext-json": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "? Nette NEON: encodes and decodes NEON file format.",
-            "homepage": "http://ne-on.org",
-            "keywords": [
-                "export",
-                "import",
-                "neon",
-                "nette",
-                "yaml"
-            ],
-            "time": "2019-02-05T21:30:40+00:00"
-        },
-        {
-            "name": "nette/php-generator",
-            "version": "v3.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/php-generator.git",
-                "reference": "aea6e81437bb238e5f0e5b5ce06337433908e63b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/php-generator/zipball/aea6e81437bb238e5f0e5b5ce06337433908e63b",
-                "reference": "aea6e81437bb238e5f0e5b5ce06337433908e63b",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^2.4.2 || ~3.0.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.3 features.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "code",
-                "nette",
-                "php",
-                "scaffolding"
-            ],
-            "time": "2019-07-05T13:01:56+00:00"
-        },
-        {
-            "name": "nette/robot-loader",
-            "version": "v3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/robot-loader.git",
-                "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/robot-loader/zipball/0712a0e39ae7956d6a94c0ab6ad41aa842544b5c",
-                "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "nette/finder": "^2.5",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "? Nette RobotLoader: high performance and comfortable autoloader that will search and autoload classes within your application.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "autoload",
-                "class",
-                "interface",
-                "nette",
-                "trait"
-            ],
-            "time": "2019-03-08T21:57:24+00:00"
-        },
-        {
-            "name": "nette/schema",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/schema.git",
-                "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d",
-                "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^3.0.1",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.2",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "📐 Nette Schema: validating data structures against a given Schema.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "config",
-                "nette"
-            ],
-            "time": "2019-04-03T15:53:25+00:00"
-        },
-        {
-            "name": "nette/utils",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/utils.git",
-                "reference": "bd961f49b211997202bda1d0fbc410905be370d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/bd961f49b211997202bda1d0fbc410905be370d4",
-                "reference": "bd961f49b211997202bda1d0fbc410905be370d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "~2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "suggest": {
-                "ext-gd": "to use Image",
-                "ext-iconv": "to use Strings::webalize() and toAscii()",
-                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
-                "ext-json": "to use Nette\\Utils\\Json",
-                "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "array",
-                "core",
-                "datetime",
-                "images",
-                "json",
-                "nette",
-                "paginator",
-                "password",
-                "slugify",
-                "string",
-                "unicode",
-                "utf-8",
-                "utility",
-                "validation"
-            ],
-            "time": "2019-03-22T01:00:30+00:00"
-        },
         {
             "name": "nikic/php-parser",
-            "version": "v4.2.4",
+            "version": "v4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4"
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4",
-                "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
                 "shasum": ""
             },
             "require": {
@@ -1638,6 +1023,7 @@
                 "php": ">=7.0"
             },
             "require-dev": {
+                "ircmaxell/php-yacc": "0.0.5",
                 "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
             },
             "bin": [
@@ -1646,7 +1032,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -1668,57 +1054,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-09-01T07:51:21+00:00"
-        },
-        {
-            "name": "ocramius/package-versions",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/PackageVersions.git",
-                "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a4d4b60d0e60da2487bd21a2c6ac089f85570dbb",
-                "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0.0",
-                "php": "^7.1.0"
-            },
-            "require-dev": {
-                "composer/composer": "^1.6.3",
-                "doctrine/coding-standard": "^5.0.1",
-                "ext-zip": "*",
-                "infection/infection": "^0.7.1",
-                "phpunit/phpunit": "^7.0.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "PackageVersions\\Installer",
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                }
-            ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "time": "2019-02-21T12:16:21+00:00"
+            "time": "2019-11-08T13:50:10+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1824,16 +1160,16 @@
         },
         {
             "name": "php-coveralls/php-coveralls",
-            "version": "v2.1.0",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-coveralls/php-coveralls.git",
-                "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d"
+                "reference": "3e6420fa666ef7bae5e750ddeac903153e193bae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3b00c229726f892bfdadeaf01ea430ffd04a939d",
-                "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d",
+                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3e6420fa666ef7bae5e750ddeac903153e193bae",
+                "reference": "3e6420fa666ef7bae5e750ddeac903153e193bae",
                 "shasum": ""
             },
             "require": {
@@ -1842,10 +1178,10 @@
                 "guzzlehttp/guzzle": "^6.0",
                 "php": "^5.5 || ^7.0",
                 "psr/log": "^1.0",
-                "symfony/config": "^2.1 || ^3.0 || ^4.0",
-                "symfony/console": "^2.1 || ^3.0 || ^4.0",
-                "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0",
-                "symfony/yaml": "^2.0 || ^3.0 || ^4.0"
+                "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0"
@@ -1859,7 +1195,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -1903,7 +1239,7 @@
                 "github",
                 "test"
             ],
-            "time": "2018-05-22T23:11:08+00:00"
+            "time": "2019-11-20T16:29:20+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -2118,126 +1454,45 @@
             ],
             "time": "2019-10-03T11:07:50+00:00"
         },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "0.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8c4ef2aefd9788238897b678a985e1d5c8df6db4",
-                "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1"
-            },
-            "require-dev": {
-                "consistence/coding-standard": "^3.5",
-                "jakub-onderka/php-parallel-lint": "^0.9.2",
-                "phing/phing": "^2.16.0",
-                "phpstan/phpstan": "^0.10",
-                "phpunit/phpunit": "^6.3",
-                "slevomat/coding-standard": "^4.7.2",
-                "squizlabs/php_codesniffer": "^3.3.2",
-                "symfony/process": "^3.4 || ^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "time": "2019-06-07T19:13:52+00:00"
-        },
         {
             "name": "phpstan/phpstan",
-            "version": "0.11.16",
+            "version": "0.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b"
+                "reference": "15a2c2b7d4195aa712506e14763ef7646ac6a08c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b",
-                "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/15a2c2b7d4195aa712506e14763ef7646ac6a08c",
+                "reference": "15a2c2b7d4195aa712506e14763ef7646ac6a08c",
                 "shasum": ""
             },
             "require": {
-                "composer/xdebug-handler": "^1.3.0",
-                "jean85/pretty-package-versions": "^1.0.3",
-                "nette/bootstrap": "^2.4 || ^3.0",
-                "nette/di": "^2.4.7 || ^3.0",
-                "nette/robot-loader": "^3.0.1",
-                "nette/schema": "^1.0",
-                "nette/utils": "^2.4.5 || ^3.0",
-                "nikic/php-parser": "^4.2.3",
-                "php": "~7.1",
-                "phpstan/phpdoc-parser": "^0.3.5",
-                "symfony/console": "~3.2 || ~4.0",
-                "symfony/finder": "~3.2 || ~4.0"
-            },
-            "conflict": {
-                "symfony/console": "3.4.16 || 4.1.5"
-            },
-            "require-dev": {
-                "brianium/paratest": "^2.0 || ^3.0",
-                "consistence/coding-standard": "^3.5",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-                "ext-intl": "*",
-                "ext-mysqli": "*",
-                "ext-simplexml": "*",
-                "ext-soap": "*",
-                "ext-zip": "*",
-                "jakub-onderka/php-parallel-lint": "^1.0",
-                "localheinz/composer-normalize": "^1.1.0",
-                "phing/phing": "^2.16.0",
-                "phpstan/phpstan-deprecation-rules": "^0.11",
-                "phpstan/phpstan-php-parser": "^0.11",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-strict-rules": "^0.11",
-                "phpunit/phpunit": "^7.5.14 || ^8.0",
-                "slevomat/coding-standard": "^4.7.2",
-                "squizlabs/php_codesniffer": "^3.3.2"
+                "nikic/php-parser": "^4.3.0",
+                "php": "^7.1"
             },
             "bin": [
-                "bin/phpstan"
+                "phpstan",
+                "phpstan.phar"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.11-dev"
+                    "dev-master": "0.12-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "PHPStan\\": [
-                        "src/"
-                    ]
-                }
+                "files": [
+                    "bootstrap.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2019-09-17T11:19:51+00:00"
+            "time": "2019-12-09T09:13:49+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2493,16 +1748,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.16",
+            "version": "7.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661"
+                "reference": "fcf6c4bfafaadc07785528b06385cce88935474d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661",
-                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fcf6c4bfafaadc07785528b06385cce88935474d",
+                "reference": "fcf6c4bfafaadc07785528b06385cce88935474d",
                 "shasum": ""
             },
             "require": {
@@ -2573,7 +1828,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-09-14T09:08:39+00:00"
+            "time": "2019-12-06T05:14:37+00:00"
         },
         {
             "name": "psr/http-message",
@@ -2627,16 +1882,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                 "shasum": ""
             },
             "require": {
@@ -2645,7 +1900,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -2670,7 +1925,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -2879,16 +2134,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.2",
+            "version": "4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
                 "shasum": ""
             },
             "require": {
@@ -2928,7 +2183,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-05-05T09:05:15+00:00"
+            "time": "2019-11-20T08:46:58+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -3280,16 +2535,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.0",
+            "version": "3.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "0afebf16a2e7f1e434920fa976253576151effe9"
+                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9",
-                "reference": "0afebf16a2e7f1e434920fa976253576151effe9",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
+                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
                 "shasum": ""
             },
             "require": {
@@ -3327,36 +2582,36 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2019-09-26T23:12:26+00:00"
+            "time": "2019-12-04T04:46:47+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.3.5",
+            "version": "v5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "0acb26407a9e1a64a275142f0ae5e36436342720"
+                "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/0acb26407a9e1a64a275142f0ae5e36436342720",
-                "reference": "0acb26407a9e1a64a275142f0ae5e36436342720",
+                "url": "https://api.github.com/repos/symfony/config/zipball/c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c",
+                "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/filesystem": "~3.4|~4.0",
+                "php": "^7.2.5",
+                "symfony/filesystem": "^4.4|^5.0",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/finder": "<3.4"
+                "symfony/finder": "<4.4"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~3.4|~4.0",
-                "symfony/finder": "~3.4|~4.0",
-                "symfony/messenger": "~4.1",
-                "symfony/yaml": "~3.4|~4.0"
+                "symfony/event-dispatcher": "^4.4|^5.0",
+                "symfony/finder": "^4.4|^5.0",
+                "symfony/messenger": "^4.4|^5.0",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/yaml": "^4.4|^5.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -3364,7 +2619,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3391,30 +2646,30 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-19T15:51:53+00:00"
+            "time": "2019-12-01T10:51:15+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.3.5",
+            "version": "v5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
+                "reference": "1d71f670bc5a07b9ccc97dc44f932177a322d4e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
-                "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/1d71f670bc5a07b9ccc97dc44f932177a322d4e6",
+                "reference": "1d71f670bc5a07b9ccc97dc44f932177a322d4e6",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3441,20 +2696,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-20T14:07:54+00:00"
+            "time": "2019-11-26T23:25:11+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
                 "shasum": ""
             },
             "require": {
@@ -3466,7 +2721,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -3499,30 +2754,30 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2019-11-27T13:56:44+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.3.5",
+            "version": "v5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71"
+                "reference": "d410282956706e0b08681a5527447a8e6b6f421e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/1e4ff456bd625be5032fac9be4294e60442e9b71",
-                "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d410282956706e0b08681a5527447a8e6b6f421e",
+                "reference": "d410282956706e0b08681a5527447a8e6b6f421e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/service-contracts": "^1.0"
+                "php": "^7.2.5",
+                "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3549,31 +2804,31 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-07T11:52:19+00:00"
+            "time": "2019-11-18T17:27:11+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.3.5",
+            "version": "v5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178"
+                "reference": "51b684480184fa767b97e28eaca67664e48dd3e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/51b684480184fa767b97e28eaca67664e48dd3e9",
+                "reference": "51b684480184fa767b97e28eaca67664e48dd3e9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/console": "<3.4"
+                "symfony/console": "<4.4"
             },
             "require-dev": {
-                "symfony/console": "~3.4|~4.0"
+                "symfony/console": "^4.4|^5.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -3581,7 +2836,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3608,34 +2863,39 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-09-11T15:41:19+00:00"
+            "time": "2019-11-18T17:27:11+00:00"
         },
         {
             "name": "thecodingmachine/phpstan-strict-rules",
-            "version": "v0.10.8",
+            "version": "v0.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/phpstan-strict-rules.git",
-                "reference": "663fad8801b24c666f3c695ca6cbbc1cb28776a9"
+                "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/663fad8801b24c666f3c695ca6cbbc1cb28776a9",
-                "reference": "663fad8801b24c666f3c695ca6cbbc1cb28776a9",
+                "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/8c58cc87dc870382b228c95c4f1cc9fc871aaf28",
+                "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1",
-                "phpstan/phpstan": "^0.10|^0.11"
+                "phpstan/phpstan": "^0.12"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.1",
                 "phpunit/phpunit": "^7.1"
             },
-            "type": "library",
+            "type": "phpstan-extension",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.10-dev"
+                    "dev-master": "0.12-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "phpstan-strict-rules.neon"
+                    ]
                 }
             },
             "autoload": {
@@ -3654,7 +2914,7 @@
                 }
             ],
             "description": "A set of additional rules for PHPStan based on best practices followed at TheCodingMachine",
-            "time": "2019-01-18T08:10:20+00:00"
+            "time": "2019-12-04T11:25:22+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -3698,31 +2958,29 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "vimeo/psalm": "<3.6.0"
+            },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -3744,7 +3002,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2019-08-24T08:43:50+00:00"
+            "time": "2019-11-24T13:36:37+00:00"
         }
     ],
     "aliases": [],
diff --git a/generator/src/DocPage.php b/generator/src/DocPage.php
index db4dfc66..8b31b384 100644
--- a/generator/src/DocPage.php
+++ b/generator/src/DocPage.php
@@ -7,7 +7,7 @@
 
 class DocPage
 {
-    /*
+    /**
      * @var string
      */
     private $path;
diff --git a/generator/src/FileCreator.php b/generator/src/FileCreator.php
index 59b271ae..28c62591 100644
--- a/generator/src/FileCreator.php
+++ b/generator/src/FileCreator.php
@@ -150,8 +150,12 @@ public function createExceptionFile(string $moduleName): void
 <?php
 namespace Safe\Exceptions;
 
-class {$exceptionName} extends AbstractSafeException
+class {$exceptionName} extends \Exception implements SafeExceptionInterface
 {
+    public static function createFromPhpError(): self
+    {
+        return new self(\json_last_error_msg(), \json_last_error());
+    }
 }
 
 EOF
diff --git a/generator/src/GenerateCommand.php b/generator/src/GenerateCommand.php
index 9d6ea35e..4fc438d7 100644
--- a/generator/src/GenerateCommand.php
+++ b/generator/src/GenerateCommand.php
@@ -10,7 +10,7 @@
 
 class GenerateCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('generate')
@@ -68,7 +68,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         require_once __DIR__.'/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__.'/../../lib/Exceptions/AbstractSafeException.php';
         foreach ($files as $file) {
             require($file);
         }
@@ -76,6 +75,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Finally, let's edit the composer.json file
         $output->writeln('Editing composer.json');
         ComposerJsonEditor::editFiles(\array_values($modules));
+        
+        return 0;
     }
 
     private function rmGenerated(): void
diff --git a/generator/src/Method.php b/generator/src/Method.php
index be0a6386..0a6d81e5 100644
--- a/generator/src/Method.php
+++ b/generator/src/Method.php
@@ -196,7 +196,7 @@ private function getStringForXPath(string $xpath): string
         return trim($str);
     }
 
-    private function getDocBlockReturnType(): ?string
+    private function getDocBlockReturnType(): string
     {
         return $this->returnType->getDocBlockType($this->errorType);
     }
diff --git a/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php b/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
index 272377eb..44afb312 100644
--- a/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
+++ b/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
@@ -6,8 +6,6 @@
  */
 
 return [
-    'mb_ereg_replace_callback' => ['string|false', 'pattern'=>'string', 'callback'=>'callable', 'string'=>'string', 'option='=>'string'],
-    'swoole_async_writefile' => ['bool', 'filename'=>'string', 'content'=>'string', 'callback='=>'callable', 'flags='=>'int'],
     'libxml_get_last_error' => ['LibXMLError|false'], //LibXMLError need to be uppercase
     'gmp_random_seed' => ['void', 'seed'=>'GMP|string|int'], //gmp_random_seed doesn't return
     'imageconvolution' => ['bool', 'src_im'=>'resource', 'matrix3x3'=>'array', 'div'=>'float', 'offset'=>'float'], //imageconvolution return a bool
diff --git a/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php b/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php
index 936c4b8b..ac36580b 100644
--- a/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php
+++ b/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php
@@ -16,7 +16,7 @@ class PhpStanFunctionMapReader
 
     public function __construct()
     {
-        $this->functionMap = require __DIR__.'/../../vendor/phpstan/phpstan/src/Reflection/SignatureMap/functionMap.php';
+        $this->functionMap = require 'phar://'.__DIR__.'/../../vendor/phpstan/phpstan/phpstan.phar/src/Reflection/SignatureMap/functionMap.php';
         $this->customFunctionMap = require __DIR__.'/CustomPhpStanFunctionMap.php';
     }
 
@@ -31,7 +31,7 @@ public function getFunction(string $functionName): PhpStanFunction
         $customMap = $this->customFunctionMap[$functionName] ?? null;
         if ($map && $customMap) {
             if ($customMap === $map) {
-                throw new \RuntimeException('Useless custom function map: '.var_export($customMap, true)."\nPlease delete this line from the custom file");
+                throw new \RuntimeException("Useless custom function map $functionName: ".var_export($customMap, true)."\nPlease delete this line from the custom file");
             }
             $map = $customMap;
         }
diff --git a/generator/src/ScanObjectsCommand.php b/generator/src/ScanObjectsCommand.php
index 2e3703e1..737ae8be 100644
--- a/generator/src/ScanObjectsCommand.php
+++ b/generator/src/ScanObjectsCommand.php
@@ -9,7 +9,7 @@
 
 class ScanObjectsCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('scan-objects')
@@ -34,5 +34,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln('These methods are overloaded: '.\implode(', ', $overloadedFunctions));
+        return 0;
     }
 }
diff --git a/generator/src/Scanner.php b/generator/src/Scanner.php
index 17645e46..7b7b4bbe 100644
--- a/generator/src/Scanner.php
+++ b/generator/src/Scanner.php
@@ -10,11 +10,21 @@
 
 class Scanner
 {
-    /*
+    /**
      * @var string
      */
     private $path;
 
+    /**
+     * @var string[]
+     */
+    private $ignoredFunctions;
+
+    /**
+     * @var string[]
+     */
+    private $ignoredModules;
+
     public function __construct(string $path)
     {
         $this->path = $path;
@@ -42,8 +52,6 @@ public function getMethodsPaths(): array
         return iterator_to_array($finder);
     }
 
-    private $ignoredFunctions;
-
     /**
      * Returns the list of functions that must be ignored.
      * @return string[]
@@ -59,8 +67,6 @@ private function getIgnoredFunctions(): array
         return $this->ignoredFunctions;
     }
 
-    private $ignoredModules;
-
     /**
      * Returns the list of modules that must be ignored.
      * @return string[]
diff --git a/generator/tests/DateTimeImmutableTest.php b/generator/tests/DateTimeImmutableTest.php
index d88ee7be..b4a99747 100644
--- a/generator/tests/DateTimeImmutableTest.php
+++ b/generator/tests/DateTimeImmutableTest.php
@@ -12,7 +12,6 @@ class DateTimeImmutableTest extends TestCase
     protected function setUp()
     {
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../generated/Exceptions/DatetimeException.php';
         require_once __DIR__ . '/../../lib/DateTimeImmutable.php';
     }
diff --git a/generator/tests/DateTimeTest.php b/generator/tests/DateTimeTest.php
index 4e9db911..fc12eb29 100644
--- a/generator/tests/DateTimeTest.php
+++ b/generator/tests/DateTimeTest.php
@@ -12,7 +12,6 @@ class DateTimeTest extends TestCase
     protected function setUp()
     {
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../generated/Exceptions/DatetimeException.php';
         require_once __DIR__ . '/../../lib/DateTime.php';
     }
diff --git a/generator/tests/GeneratedFilesTest.php b/generator/tests/GeneratedFilesTest.php
index 902276a7..34b17721 100644
--- a/generator/tests/GeneratedFilesTest.php
+++ b/generator/tests/GeneratedFilesTest.php
@@ -16,7 +16,6 @@ public function testSprintf()
     {
         require_once __DIR__ . '/../../generated/strings.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../generated/Exceptions/StringsException.php';
 
         $this->assertSame('foo', sprintf('foo'));
@@ -37,7 +36,6 @@ public function testPregMatch()
     {
         require_once __DIR__ . '/../../generated/pcre.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../lib/Exceptions/PcreException.php';
 
 
@@ -52,7 +50,6 @@ public function testObjects()
     {
         require_once __DIR__ . '/../../generated/simplexml.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../generated/Exceptions/SimplexmlException.php';
 
         $xmlStr = <<<XML
@@ -83,7 +80,6 @@ public function testPregSplit()
     {
         require_once __DIR__ . '/../../generated/pcre.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../lib/Exceptions/PcreException.php';
 
         $keywords = preg_split("/[\s,]+/", "hypertext language, programming", null);
@@ -98,7 +94,6 @@ public function testStrtotime()
     {
         require_once __DIR__ . '/../../generated/datetime.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../generated/Exceptions/DatetimeException.php';
 
         $this->assertSame(\strtotime('+1 day'), strtotime('+1 day'));
@@ -111,7 +106,6 @@ public function testOpenSslSign()
     {
         require_once __DIR__ . '/../../generated/openssl.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__ . '/../../lib/Exceptions/OpensslException.php';
 
         \openssl_sign('foo', $signature, file_get_contents(__DIR__ . '/fixtures/id_rsa'));
diff --git a/generator/tests/SpecialCasesTest.php b/generator/tests/SpecialCasesTest.php
index 707e1158..c90a7343 100644
--- a/generator/tests/SpecialCasesTest.php
+++ b/generator/tests/SpecialCasesTest.php
@@ -12,7 +12,6 @@ public function testPregReplace()
     {
         require_once __DIR__.'/../../lib/special_cases.php';
         require_once __DIR__.'/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__.'/../../lib/Exceptions/AbstractSafeException.php';
         require_once __DIR__.'/../../lib/Exceptions/PcreException.php';
 
         $this->expectException(PcreException::class);
diff --git a/lib/DateTimeImmutable.php b/lib/DateTimeImmutable.php
index 8537d56d..51cf041e 100644
--- a/lib/DateTimeImmutable.php
+++ b/lib/DateTimeImmutable.php
@@ -20,6 +20,12 @@ class DateTimeImmutable extends \DateTimeImmutable
      */
     private $innerDateTime;
 
+    /**
+     * DateTimeImmutable constructor.
+     * @param string $time
+     * @param DateTimeZone|null $timezone
+     * @throws \Exception
+     */
     public function __construct($time = 'now', $timezone = null)
     {
         parent::__construct();
@@ -51,6 +57,10 @@ public static function createFromFormat($format, $time, $timezone = null): self
         return self::createFromRegular($datetime);
     }
 
+    /**
+     * @param string $format
+     * @return string
+     */
     public function format($format): string
     {
         /** @var string|false $result */
@@ -61,6 +71,11 @@ public function format($format): string
         return $result;
     }
 
+    /**
+     * @param DateTimeInterface $datetime2
+     * @param bool $absolute
+     * @return DateInterval
+     */
     public function diff($datetime2, $absolute = false): DateInterval
     {
         /** @var \DateInterval|false $result */
@@ -71,6 +86,10 @@ public function diff($datetime2, $absolute = false): DateInterval
         return $result;
     }
 
+    /**
+     * @param string $modify
+     * @return DateTimeImmutable
+     */
     public function modify($modify): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -81,6 +100,12 @@ public function modify($modify): self
         return self::createFromRegular($result); //we have to recreate a safe datetime because modify create a new instance of \DateTimeImmutable
     }
 
+    /**
+     * @param int $year
+     * @param int $month
+     * @param int $day
+     * @return DateTimeImmutable
+     */
     public function setDate($year, $month, $day): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -91,6 +116,12 @@ public function setDate($year, $month, $day): self
         return self::createFromRegular($result); //we have to recreate a safe datetime because modify create a new instance of \DateTimeImmutable
     }
 
+    /**
+     * @param int $year
+     * @param int $week
+     * @param int $day
+     * @return DateTimeImmutable
+     */
     public function setISODate($year, $week, $day = 1): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -101,6 +132,13 @@ public function setISODate($year, $week, $day = 1): self
         return self::createFromRegular($result); //we have to recreate a safe datetime because modify create a new instance of \DateTimeImmutable
     }
 
+    /**
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
+     * @param int $microseconds
+     * @return DateTimeImmutable
+     */
     public function setTime($hour, $minute, $second = 0, $microseconds = 0): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -111,6 +149,10 @@ public function setTime($hour, $minute, $second = 0, $microseconds = 0): self
         return self::createFromRegular($result);
     }
 
+    /**
+     * @param int $unixtimestamp
+     * @return DateTimeImmutable
+     */
     public function setTimestamp($unixtimestamp): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -121,6 +163,10 @@ public function setTimestamp($unixtimestamp): self
         return self::createFromRegular($result);
     }
 
+    /**
+     * @param DateTimeZone $timezone
+     * @return DateTimeImmutable
+     */
     public function setTimezone($timezone): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -131,6 +177,10 @@ public function setTimezone($timezone): self
         return self::createFromRegular($result);
     }
 
+    /**
+     * @param DateInterval $interval
+     * @return DateTimeImmutable
+     */
     public function sub($interval): self
     {
         /** @var \DateTimeImmutable|false $result */
@@ -154,16 +204,28 @@ public function getOffset(): int
     //////////////////////////////////////////////////////////////////////////////////////////
     //overload getters to use the inner datetime immutable instead of itself
 
+    /**
+     * @param DateInterval $interval
+     * @return DateTimeImmutable
+     */
     public function add($interval): self
     {
         return self::createFromRegular($this->innerDateTime->add($interval));
     }
 
+    /**
+     * @param DateTime $dateTime
+     * @return DateTimeImmutable
+     */
     public static function createFromMutable($dateTime): self
     {
         return self::createFromRegular(parent::createFromMutable($dateTime));
     }
 
+    /**
+     * @param mixed[] $array
+     * @return DateTimeImmutable
+     */
     public static function __set_state(array $array): self
     {
         return self::createFromRegular(parent::__set_state($array));
diff --git a/lib/Exceptions/AbstractSafeException.php b/lib/Exceptions/AbstractSafeException.php
deleted file mode 100644
index 2e36f09c..00000000
--- a/lib/Exceptions/AbstractSafeException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-
-namespace Safe\Exceptions;
-
-abstract class AbstractSafeException extends \ErrorException implements SafeExceptionInterface
-{
-    public static function createFromPhpError(): self
-    {
-        $error = error_get_last();
-
-        return new static($error['message'], 0, $error['type']);
-    }
-}
diff --git a/lib/Exceptions/CurlException.php b/lib/Exceptions/CurlException.php
index 8920fd21..2814066b 100644
--- a/lib/Exceptions/CurlException.php
+++ b/lib/Exceptions/CurlException.php
@@ -3,13 +3,13 @@
 
 namespace Safe\Exceptions;
 
-class CurlException extends AbstractSafeException
+class CurlException extends \Exception implements SafeExceptionInterface
 {
     /**
      * @param resource $ch
      */
     public static function createFromCurlResource($ch): self
     {
-        return new static(\curl_error($ch), \curl_errno($ch));
+        return new self(\curl_error($ch), \curl_errno($ch));
     }
 }
diff --git a/lib/Exceptions/JsonException.php b/lib/Exceptions/JsonException.php
index dc83a162..4300d29e 100644
--- a/lib/Exceptions/JsonException.php
+++ b/lib/Exceptions/JsonException.php
@@ -7,6 +7,6 @@ class JsonException extends \Exception implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new static(\json_last_error_msg(), \json_last_error());
+        return new self(\json_last_error_msg(), \json_last_error());
     }
 }
diff --git a/lib/Exceptions/OpensslException.php b/lib/Exceptions/OpensslException.php
index a9f4c10f..5f424af2 100644
--- a/lib/Exceptions/OpensslException.php
+++ b/lib/Exceptions/OpensslException.php
@@ -7,6 +7,6 @@ class OpensslException extends \Exception implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new static(\openssl_error_string(), 0);
+        return new self(\openssl_error_string() ?: '', 0);
     }
 }
diff --git a/lib/Exceptions/PcreException.php b/lib/Exceptions/PcreException.php
index 88eae084..ee6367ef 100644
--- a/lib/Exceptions/PcreException.php
+++ b/lib/Exceptions/PcreException.php
@@ -16,6 +16,6 @@ public static function createFromPhpError(): self
             PREG_JIT_STACKLIMIT_ERROR => 'PREG_JIT_STACKLIMIT_ERROR',
         ];
         $errMsg = $errorMap[preg_last_error()] ?? 'Unknown PCRE error: '.preg_last_error();
-        return new static($errMsg, \preg_last_error());
+        return new self($errMsg, \preg_last_error());
     }
 }
diff --git a/lib/special_cases.php b/lib/special_cases.php
index 5818cc27..05682b8a 100644
--- a/lib/special_cases.php
+++ b/lib/special_cases.php
@@ -63,7 +63,7 @@ function apc_fetch($key)
  * @param string|string[] $key The key used to store the value (with
  * apcu_store). If an array is passed then each
  * element is fetched and returned.
- * @return mixed The stored variable or array of variables on success; FALSE on failure
+ * @return mixed The stored variable or array of variables on success
  * @throws ApcuException
  *
  */
@@ -130,7 +130,7 @@ function apcu_fetch($key)
  * 'strlen(\'$1\')+strlen("$2")'). Make sure you are
  * aware of PHP's string
  * syntax to know exactly how the interpreted string will look.
- * @param string|array $subject The string or an array with strings to search and replace.
+ * @param string|array|string[] $subject The string or an array with strings to search and replace.
  *
  * If subject is an array, then the search and
  * replace is performed on every entry of subject,
@@ -140,7 +140,7 @@ function apcu_fetch($key)
  * -1 (no limit).
  * @param int $count If specified, this variable will be filled with the number of
  * replacements done.
- * @return string|array preg_replace returns an array if the
+ * @return string|array|string[] preg_replace returns an array if the
  * subject parameter is an array, or a string
  * otherwise.
  *
diff --git a/phpstan.neon b/phpstan.neon
index 9cbb5b7c..d6b61d51 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,5 @@
 parameters:
     ignoreErrors:
         # A lot of functions are in extensions so it is ok not to find those
-        - "#Function .* not found#"
-        - "#Undefined variable: \\$success#"
 includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
\ No newline at end of file