- "imported" Registry class
- rewrote exception handler to also handle anything else that implements
Throwable
- please note that application/<foo>/exceptions.php may become generalized
and will no longer be loaded as the same functionality is provided by this
framework then.
Signed-off-by: Roland Häder <roland@mxchange.org>
43 files changed:
use CoreFramework\Manager\ManageableApplication;
use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registerable;
use CoreFramework\Manager\ManageableApplication;
use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registerable;
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
// The node's own exception handler
function tests_exception_handler ($exceptionInstance) {
// Is it an object and a valid instance?
// The node's own exception handler
function tests_exception_handler ($exceptionInstance) {
// Is it an object and a valid instance?
- if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof FrameworkException)) {
+ if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Throwable)) {
// Init variable
$backTrace = '';
// Init variable
$backTrace = '';
--------------------------------------------------------------------------------
%s
--------------------------------------------------------------------------------\n",
--------------------------------------------------------------------------------
%s
--------------------------------------------------------------------------------\n",
- trim(html_entity_decode(strip_tags($exceptionInstance->__toString()))),
+ trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))),
trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))),
trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))),
- $exceptionInstance->getHexCode(),
+ ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())),
$exceptionInstance->getFile(),
$exceptionInstance->getLine(),
trim($backTrace)
$exceptionInstance->getFile(),
$exceptionInstance->getLine(),
trim($backTrace)
// Output the message
print($message);
// Output the message
print($message);
+ } elseif (is_object($exceptionInstance)) {
+ // Output more details
+ printf('exceptionInstance=%s' . PHP_EOL, get_class($exceptionInstance));
- // Invalid exception instance detected! Do *only* throw exceptions that
- // extends our own exception 'FrameworkException' to get such nice
- // outputs like above.
- print('exceptionInstance[]=' . gettype($exceptionInstance) . ' is invalid! Please inform the core developer team.' . PHP_EOL);
+ /*
+ * Invalid exception instance detected! Do *only* throw exceptions that
+ * extends our own exception 'FrameworkException' to get such nice
+ * outputs like above.
+ */
+ printf('exceptionInstance[]=%s is invalid! Please inform the core developer team.' . PHP_EOL, gettype($exceptionInstance));
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Generic\Registry;
/**
* A general application class for the ApplicationHelper classes.
/**
* A general application class for the ApplicationHelper classes.
use CoreFramework\Loader\ClassLoader;
use CoreFramework\Manager\ManageableApplication;
use CoreFramework\Registry\Register;
use CoreFramework\Loader\ClassLoader;
use CoreFramework\Manager\ManageableApplication;
use CoreFramework\Registry\Register;
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
// Import SPL stuff
use CoreFramework\Template\CompileableTemplate;
// Import SPL stuff
// Own namespace
namespace CoreFramework\Command\Guest;
// Own namespace
namespace CoreFramework\Command\Guest;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A command for the confirmation link handling
*
/**
* A command for the confirmation link handling
*
// Own namespace
namespace CoreFramework\Command\Login;
// Own namespace
namespace CoreFramework\Command\Login;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A command for the login area (member/gamer area)
*
/**
* A command for the login area (member/gamer area)
*
// Import framework stuff
use CoreFramework\Registry\Registerable;
// Import framework stuff
use CoreFramework\Registry\Registerable;
+use CoreFramework\Registry\Generic\Registry;
/**
* A command for the login form
/**
* A command for the login form
// Import framework stuff
use CoreFramework\Registry\Registerable;
// Import framework stuff
use CoreFramework\Registry\Registerable;
+use CoreFramework\Registry\Generic\Registry;
/**
* A command class for the registration form
/**
* A command class for the registration form
// Own namespace
namespace CoreFramework\Command\Guest;
// Own namespace
namespace CoreFramework\Command\Guest;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A command class for resending the confirmation link
*
/**
* A command class for resending the confirmation link
*
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Generic\Registry;
/**
* A generic controller class. You should extend this base class if you want to
/**
* A generic controller class. You should extend this base class if you want to
// Own namespace
namespace CoreFramework\Factory\Client;
// Own namespace
namespace CoreFramework\Factory\Client;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* An object factory for clients
*
/**
* An object factory for clients
*
// Own namespace
namespace CoreFramework\Factory\Database\Wrapper;
// Own namespace
namespace CoreFramework\Factory\Database\Wrapper;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for socket registries
*
/**
* A factory class for socket registries
*
// Own namespace
namespace CoreFramework\Factory\Filesystem\Stack;
// Own namespace
namespace CoreFramework\Factory\Filesystem\Stack;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for file-based stack indexes
*
/**
* A factory class for file-based stack indexes
*
// Own namespace
namespace CoreFramework\Factory\Login;
// Own namespace
namespace CoreFramework\Factory\Login;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for socket registries
*
/**
* A factory class for socket registries
*
// Own namespace
namespace CoreFramework\Factory\Registry;
// Own namespace
namespace CoreFramework\Factory\Registry;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for socket registries
*
/**
* A factory class for socket registries
*
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for file-based stacks
/**
* A factory class for file-based stacks
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Registry\Generic\Registry;
/**
* A factory class for socket registries
/**
* A factory class for socket registries
// Own namespace
namespace CoreFramework\Factory\Template;
// Own namespace
namespace CoreFramework\Factory\Template;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A factory class for XML template engines. All instances generated by this
* factory does have language support disabled and XML-compacting enabled (to
/**
* A factory class for XML template engines. All instances generated by this
* factory does have language support disabled and XML-compacting enabled (to
// Own namespace
namespace CoreFramework\Filter\User\Auth;
// Own namespace
namespace CoreFramework\Filter\User\Auth;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for checking user permissions
*
/**
* A filter for checking user permissions
*
// Own namespace
namespace CoreFramework\Filter\Change\Email;
// Own namespace
namespace CoreFramework\Filter\Change\Email;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for detecting email changes
*
/**
* A filter for detecting email changes
*
// Own namespace
namespace CoreFramework\Filter\Change\Email;
// Own namespace
namespace CoreFramework\Filter\Change\Email;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for password change detection
*
/**
* A filter for password change detection
*
// Own namespace
namespace CoreFramework\Filter\News;
// Own namespace
namespace CoreFramework\Filter\News;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A pre-filter for downloading news from a source. This can be a XML feed or
* the local database. You *can* register this filter as post filter but for
/**
* A pre-filter for downloading news from a source. This can be a XML feed or
* the local database. You *can* register this filter as post filter but for
// Own namespace
namespace CoreFramework\Filter\Discovery\Payment;
// Own namespace
namespace CoreFramework\Filter\Discovery\Payment;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for payment discovery. This class discovers the payment type and
* returns an object holding all available payment system for the requested
/**
* A filter for payment discovery. This class discovers the payment type and
* returns an object holding all available payment system for the requested
// Own namespace
namespace CoreFramework\Filter\User\Status;
// Own namespace
namespace CoreFramework\Filter\User\Status;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for updating the user account status to confirmed
*
/**
* A filter for updating the user account status to confirmed
*
// Own namespace
namespace CoreFramework\Filter\User;
// Own namespace
namespace CoreFramework\Filter\User;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for updating the user account like last activity, last action
* performed and so on.
/**
* A filter for updating the user account like last activity, last action
* performed and so on.
// Own namespace
namespace CoreFramework\Filter\Validator\Email;
// Own namespace
namespace CoreFramework\Filter\Validator\Email;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A concrete filter for validating the email address. This filter may intercept
* the filter chain if no email address is given or if supplied email has an
/**
* A concrete filter for validating the email address. This filter may intercept
* the filter chain if no email address is given or if supplied email has an
// Own namespace
namespace CoreFramework\Filter\Validator\Username;
// Own namespace
namespace CoreFramework\Filter\Validator\Username;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A concrete filter for validating the username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
/**
* A concrete filter for validating the username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
// Own namespace
namespace CoreFramework\Filter\Verifier\Password;
// Own namespace
namespace CoreFramework\Filter\Verifier\Password;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A concrete filter for validating the password. This filter may intercept
* the filter chain if no password is given or the password is invalid
/**
* A concrete filter for validating the password. This filter may intercept
* the filter chain if no password is given or the password is invalid
// Own namespace
namespace CoreFramework\Filter\Verifier\Confirmation;
// Own namespace
namespace CoreFramework\Filter\Verifier\Confirmation;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for checking if supplied confirmation code is valid.
*
/**
* A filter for checking if supplied confirmation code is valid.
*
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A concrete filter for verfying the guest username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
/**
* A concrete filter for verfying the guest username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A concrete filter for verfying the username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
/**
* A concrete filter for verfying the username. This filter may intercept the
* filter chain if no username is given or if supplied username has an invalid
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for checking if user status is GUEST or CONFIRMED.
*
/**
* A filter for checking if user status is GUEST or CONFIRMED.
*
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
// Own namespace
namespace CoreFramework\Filter\Verifier\User;
+// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
+
/**
* A filter for checking if user status is UNCONFIRMED.
*
/**
* A filter for checking if user status is UNCONFIRMED.
*
// Import framework stuff
use CoreFramework\Generic\FrameworkInterface;
use CoreFramework\Object\BaseFrameworkSystem;
// Import framework stuff
use CoreFramework\Generic\FrameworkInterface;
use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Generic\Registry;
/**
* A generic helper class with generic methods
/**
* A generic helper class with generic methods
namespace CoreFramework\Helper;
// Import framework stuff
namespace CoreFramework\Helper;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
// Import framework stuff
use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Configuration\FrameworkConfiguration;
use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registerable;
use CoreFramework\Configuration\FrameworkConfiguration;
use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registerable;
+use CoreFramework\Registry\Generic\Registry;
/**
* The language sub-system for handling language strings being used in the
/**
* The language sub-system for handling language strings being used in the
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
// Import framework stuff
use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Generic\Registry;
/**
* A generic request class
/**
* A generic request class
namespace CoreFramework\Template\Engine;
// Import framework stuff
namespace CoreFramework\Template\Engine;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
namespace CoreFramework\Template\Engine;
// Import framework stuff
namespace CoreFramework\Template\Engine;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
namespace CoreFramework\Template\Engine;
// Import framework stuff
namespace CoreFramework\Template\Engine;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
namespace CoreFramework\Template\Engine;
// Import framework stuff
namespace CoreFramework\Template\Engine;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
namespace CoreFramework\Template\Engine;
// Import framework stuff
namespace CoreFramework\Template\Engine;
// Import framework stuff
+use CoreFramework\Registry\Generic\Registry;
use CoreFramework\Template\CompileableTemplate;
/**
use CoreFramework\Template\CompileableTemplate;
/**
projects / core.git / commitdiff