Continued:

- added more type-hints
- added more checks on parameter
- changed old array() to "new" [] style
- added some debug lines

diff --git a/framework/config/class_FrameworkConfiguration.php b/framework/config/class_FrameworkConfiguration.php
index b4696e1b660672fb92d4d61fcf6062012352000f..f5d60c179c361ad1918213942862ec20fb57a81c 100644 (file)
--- a/framework/config/class_FrameworkConfiguration.php
+++ b/framework/config/class_FrameworkConfiguration.php
@@ -143,7 +143,7 @@ class FrameworkConfiguration implements Registerable {
         */
        public final function setConfigEntry (string $configKey, $configValue) {
                // Is a valid configuration key key provided?
-               //* NOISY-DEBUG: */ printf('[%s:%d]: configKey=%s,configValue[]=%s' . PHP_EOL, __METHOD__, __LINE__, $configKey, gettype($configValue));
+               //* NOISY-DEBUG: */ printf('[%s:%d]: configKey=%s,configValue[]=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $configKey, gettype($configValue));
                if (empty($configKey)) {
                        // Entry is empty
                        throw new InvalidArgumentException('Parameter "configKey" is empty', self::EXCEPTION_CONFIG_KEY_IS_EMPTY);
@@ -156,7 +156,7 @@ class FrameworkConfiguration implements Registerable {
                $configKey = StringUtils::convertDashesToUnderscores($configKey);
 
                // Set the configuration value
-               //* NOISY-DEBUG: */ printf('[%s:%d]: configKey=%s,configValue[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, $configKey, gettype($configValue), $configValue);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Setting configKey=%s,configValue[%s]=%s - EXIT!' . PHP_EOL, __METHOD__, __LINE__, $configKey, gettype($configValue), $configValue);
                self::$configData[$configKey] = $configValue;
        }
 

diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php
index ffb4c4368d852a3c7a296a82fe183c3b4f889639..7764cb3d00dac5fc4c7e2b081dc18af4c71dfbda 100644 (file)
--- a/framework/loader/class_ClassLoader.php
+++ b/framework/loader/class_ClassLoader.php
@@ -377,6 +377,7 @@ final class ClassLoader {
                $classNameParts = explode("\\", $className);
 
                // At least 3 parts should be there
+               //* NOISY-DEBUG: */ printf('[%s:%d]: self::strictNamingConvention=%d,classNameParts()=%d' . PHP_EOL, __METHOD__, __LINE__, intval(self::$strictNamingConvention), count($classNameParts));
                if ((self::$strictNamingConvention === true) && (count($classNameParts) < 5)) {
                        // Namespace scheme is: Tld\Domain\Project\Package[\SubPackage...]
                        throw new InvalidArgumentException(sprintf('Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar', $className));

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index b9202e8e4482d350f126b9260d8eaba1acc9aec0..62b5647ff877b397e0609096a16be55520d64650 100644 (file)
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -143,7 +143,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
         * @param       $email                  Email to check for existence
         * @return      $alreadyTaken   Whether the email has been taken
         */
-       private function ifEmailIsTaken ($email) {
+       private function ifEmailIsTaken (string $email) {
                // Default is already taken
                $alreadyTaken = true;
 

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 5a581e8aac3ac7217d25220be41c9b713c7d1555..70ea0016771f3947da86f8c19f15bf300528a1d3 100644 (file)
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -109,7 +109,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
         * @param       $userName               Username to check for existence
         * @return      $alreadyTaken   Whether the username has been taken
         */
-       private function ifUserNameIsTaken ($userName) {
+       private function ifUserNameIsTaken (string $userName) {
                // Default is already taken
                $alreadyTaken = true;
 

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index 6dc1b386fc7eabec71694fff8836c0140f65b321..fecfce37458a3af083497a8340745cc809f63d27 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -111,7 +111,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
         * @param       $userName               Username to check for existence
         * @return      $alreadyTaken   Whether the username has been taken
         */
-       private function ifUserGuestIsTaken ($userName) {
+       private function ifUserGuestIsTaken (string $userName) {
                // Default is already taken
                $alreadyTaken = true;
 

diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index 97e097156bb208e44e980791dacd829c1ba6f9d5..a5856458b073d8e580cbdf70d5b97de0a02633d2 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -109,7 +109,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
         * @param       $userName               Username to check for existence
         * @return      $alreadyTaken   Whether the username has been taken
         */
-       private function ifUserNameIsTaken ($userName) {
+       private function ifUserNameIsTaken (string $userName) {
                // Default is already taken
                $alreadyTaken = true;
 

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 41630078de26fb7da199506eb99b5eb6e0e55f15..3ac7c9efd5ffc80443a86e0e59c72d6479b7f167 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -9,6 +9,9 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
 use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
+// Import SPL stuff
+use \InvalidArgumentException;
+
 /**
  * A generic class for handling guests
  *
@@ -84,7 +87,13 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
         * @throws      UsernameMissingException        If the username does not exist
         * @throws      UserNoGuestException            If the user is no guest account
         */
-       public static final function createGuestByUsername ($userName) {
+       public static final function createGuestByUsername (string $userName) {
+               // Check parameter
+               if (empty($userName)) {
+                       // Throw IAE
+                       throw new InvalidArgumentException('Paramter "userName" is empty');
+               }
+
                // Get a new instance
                $userInstance = new Guest();
 
@@ -111,7 +120,13 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
         */
-       public static final function createGuestByEmail ($email) {
+       public static final function createGuestByEmail (string $email) {
+               // Check parameter
+               if (empty($email)) {
+                       // Throw IAE
+                       throw new InvalidArgumentException('Paramter "email" is empty');
+               }
+
                // Get a new instance
                $userInstance = new Guest();
 

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index 27baa42b73394ae55ebcd48687810e8fcb134e8b..4c6ce760d58ae4bca5a3b19e57a29fdf88b569e6 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -11,6 +11,9 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
 use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
+// Import SPL stuff
+use \InvalidArgumentException;
+
 /**
  * A generic class for handling users
  *
@@ -54,7 +57,13 @@ class Member extends BaseUser implements ManageableMember, Registerable {
         * @throws      UsernameMissingException        If the username does not exist
         * @throws      UnexpectedGuestAccountException         If the user status is 'guest'
         */
-       public static final function createMemberByUsername ($userName) {
+       public static final function createMemberByUsername (string $userName) {
+               // Check parameter
+               if (empty($userName)) {
+                       // Throw IAE
+                       throw new InvalidArgumentException('Parameter "userName" is empty');
+               }
+
                // Get a new instance
                $userInstance = new Member();
 
@@ -81,7 +90,13 @@ class Member extends BaseUser implements ManageableMember, Registerable {
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
         */
-       public static final function createMemberByEmail ($email) {
+       public static final function createMemberByEmail (string $email) {
+               // Check parameter
+               if (empty($email)) {
+                       // Throw IAE
+                       throw new InvalidArgumentException('Parameter "email" is empty');
+               }
+
                // Get a new instance
                $userInstance = new Member();
 

diff --git a/framework/main/middleware/io/class_FileIoHandler.php b/framework/main/middleware/io/class_FileIoHandler.php
index a496f2e021a7a71bfdac71523314f888d63bca69..1f0e8a027545c82512c1ee44a398b24c486d0d9b 100644 (file)
--- a/framework/main/middleware/io/class_FileIoHandler.php
+++ b/framework/main/middleware/io/class_FileIoHandler.php
@@ -120,10 +120,10 @@ class FileIoHandler extends BaseMiddleware implements IoHandler {
                }
 
                // Prepare output array
-               $dataArray = array(
+               $dataArray = [
                        0 => $className,
                        1 => $dataStream
-               );
+               ];
 
                // Send the infoInstance and dataArray to the output handler
                $this->getOutputStreamerInstance()->saveFile($infoInstance, $dataArray);