Continued:

- rewrote ObjectFactory for some performance improvement, yet still more needs
  to be done, maybe some static "cache" array and then use reflection to clean
  up old instance?
- debug messages are now "hidden" in HTML comment blocks
- InvalidClassNameException is now emptied and InvalidArgumentException is used
  instead

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index f06a70a16b6a82a4ff32738853114b89ffdbb4b9..1066e47a0bccb298419b8b89edf648367b074a0a 100644 (file)
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -55,23 +55,26 @@ class ObjectFactory extends BaseFactory {
         * @throws      InvalidArgumentException        If className is empty or the name not following naming-convention
         */
        public static final function createObjectByName ($className, array $args = array()) {
         * @throws      InvalidArgumentException        If className is empty or the name not following naming-convention
         */
        public static final function createObjectByName ($className, array $args = array()) {

-               // First get an instance of this factory
-               $factoryInstance = new ObjectFactory();
-
-               // Split class name on backslash to check naming-convention
-               $classNameParts = explode("\\", $className);
-

                // Is the class name valid and is the class there?
                if (empty($className)) {
                        // Throw an exception here
                        throw new InvalidArgumentException('Parameter "className" is empty');
                } elseif (!class_exists($className)) {
                // Is the class name valid and is the class there?
                if (empty($className)) {
                        // Throw an exception here
                        throw new InvalidArgumentException('Parameter "className" is empty');
                } elseif (!class_exists($className)) {

+                       // First get an instance of this factory
+                       $factoryInstance = new ObjectFactory();
+

                        // Then throw an exception
                        throw new NoClassException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);
                        // Then throw an exception
                        throw new NoClassException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);

-               } elseif (count($classNameParts) < 3) {
+               }
+
+               // Split class name on backslash to check naming-convention
+               $classNameParts = explode("\\", $className);
+
+               // Okay, does it follow naming-convention?
+               if (count($classNameParts) < 4) {

                        // Namespaces are missing
                        throw new InvalidArgumentException(sprintf('Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar', $className));
                        // Namespaces are missing
                        throw new InvalidArgumentException(sprintf('Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar', $className));

-               }
+               } // END - if

 
                // Create method name
                $methodName = sprintf('create%s', self::stripNamespaceFromClassName($className));
 
                // Create method name
                $methodName = sprintf('create%s', self::stripNamespaceFromClassName($className));


@@ -111,16 +114,16 @@ class ObjectFactory extends BaseFactory {
         *
         * @param       $fullClassName  Class name with namespace
         * @return      $shortClassName Stripped class name (no namespace)
         *
         * @param       $fullClassName  Class name with namespace
         * @return      $shortClassName Stripped class name (no namespace)

-        * @throws      InvalidClassNameException       If the class name does not follow naming convention
+        * @throws      InvalidArgumentException        If the class name does not follow naming convention

         */
        private static function stripNamespaceFromClassName ($fullClassName) {
                // The class name should contain at least 2 back-slashes, so split at them
                $classNameParts = explode("\\", $fullClassName);
 
         */
        private static function stripNamespaceFromClassName ($fullClassName) {
                // The class name should contain at least 2 back-slashes, so split at them
                $classNameParts = explode("\\", $fullClassName);
 

-               // At least 3 parts should be there
-               if (count($classNameParts) < 3) {
-                       // Namespace scheme is: Project\Package[\SubPackage...]
-                       throw new InvalidClassNameException($fullClassName, self::EXCEPTION_INVALID_CLASS_NAME);
+               // At least 4 parts should be there
+               if (count($classNameParts) < 4) {
+                       // Namespace scheme is: Tld\Project\Package[\SubPackage...]
+                       throw new InvalidArgumentException($fullClassName, self::EXCEPTION_INVALID_CLASS_NAME);

                } // END - if
 
                // Get last element
                } // END - if
 
                // Get last element

diff --git a/framework/main/classes/output/debug/web/class_DebugWebOutput.php b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
index 930ff9e69324845518c7f064d0f8151b46fc118b..68dc7ae1e13ae294f50d1bfa8ac23fda0467e03d 100644 (file)
--- a/framework/main/classes/output/debug/web/class_DebugWebOutput.php
+++ b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
@@ -62,9 +62,9 @@ class DebugWebOutput extends BaseDebugOutput implements Debugger, OutputStreamer
         * @return      void
         */
        public final function outputStream ($output, $stripTags = false) {
         * @return      void
         */
        public final function outputStream ($output, $stripTags = false) {

-               // Strip out <br />
+               // Strip out any <br />

                $output = str_replace('<br />', '', $output);
                $output = str_replace('<br />', '', $output);

-               print(stripslashes($output)."<br />\n");
+               printf('<!-- %s -->' . PHP_EOL, stripslashes($output));

        }
 
        /**
        }
 
        /**

diff --git a/framework/main/exceptions/main/class_InvalidClassNameException.php b/framework/main/exceptions/main/class_InvalidClassNameException.php
index 959807d46b69d0844961a7646a9be7f6a279178f..76d010ff5e1e6ddd5ff8075ff3f9e11db31859ea 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidClassNameException.php
+++ b/framework/main/exceptions/main/class_InvalidClassNameException.php
@@ -1,51 +1,2 @@
 <?php
 <?php

-// Own namespace
-namespace Org\Mxchange\CoreFramework\Deprecated;
-
-// Import framework stuff
-use Org\Mxchange\CoreFramework\Generic\FrameworkException;
-use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
-
-/**
- * An exception thrown when a class name is invalid after naming convention.
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.shipsimu.org
- * @deprecated Don't use this anymore
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class InvalidClassNameException extends FrameworkException {
-       /**
-        * The constructor
-        *
-        * @param       $className      Class name that is invalid
-        * @param       $code   Code number for the exception
-        * @return      void
-        */
-       public function __construct ($className, $code) {
-               // Add a message around the missing class
-               $message = sprintf('[%d]: Class name "%s" is not conform to naming-convention: Tld\Domain\Project\Package[\SubPackage...]\SomeFooBar',
-                       $this->getLine(),
-                       $className
-               );
-
-               // Call parent constructor
-               parent::__construct($message, $code);
-       }
-
-}
+// [EOF]