Continued:

[core.git] / framework / main / classes / factories / class_BaseFactory.php

diff --git a/framework/main/classes/factories/class_BaseFactory.php b/framework/main/classes/factories/class_BaseFactory.php
index 1eea9ce9ae14c970f79831f58813c62e631e5c4f..5b16ef500c963df9286d3cad54af59073ba95068 100644 (file)
--- a/framework/main/classes/factories/class_BaseFactory.php
+++ b/framework/main/classes/factories/class_BaseFactory.php
@@ -41,12 +41,12 @@ abstract class BaseFactory extends BaseFrameworkSystem {
        /**
         * Protected constructor
         *
-        * @param       $fullClassName  Name of the real class (not BaseFactory)
+        * @param       $className      Name of the real class (not BaseFactory)
         * @return      void
         */
-       protected function __construct ($fullClassName) {
+       protected function __construct (string $className) {
                // Call parent constructor
-               parent::__construct($fullClassName);
+               parent::__construct($className);
        }
 
        /**
@@ -54,15 +54,15 @@ abstract class BaseFactory extends BaseFrameworkSystem {
         *
         * @param       $fullClassName  Name of the class we shall count
         */
-       protected static final function countObject ($fullClassName) {
+       protected static final function countObject (string $fullClassName) {
                // Count it up in total sum
                self::$total++;
 
                // Do we have an entry?
-               if (!isset(self::$objectCounters[$fullClassName])) {
+               if (!self::isClassCounted($fullClassName)) {
                        // No, then generate one
                        self::$objectCounters[$fullClassName] = 0;
-               } // END - if
+               }
 
                // Count it up again
                //* NOISY-DEBUG: */ print __METHOD__.': className=' .$fullClassName . PHP_EOL;
@@ -87,4 +87,15 @@ abstract class BaseFactory extends BaseFrameworkSystem {
                return self::$objectCounters;
        }
 
+       /**
+        * Checks whether given full class name is already counted
+        *
+        * @param       $fullClassName  Full name of class
+        * @return      $isCounted      Whether given class name is counted
+        */
+       protected static final function isClassCounted (string $fullClassName) {
+               // Return isset() result
+               return isset(self::$objectCounters[$fullClassName]);
+       }
+
 }