Refactured code for deprecated includes file_io and language:

[core.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 656e3cdc4fb603a6d1a6215551458e8b5661a32f..485264212e4c82a58bd55ad776eb3543f243439a 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -197,8 +197,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_ATTRIBUTES_ARE_MISSING       = 0x02b;
        const EXCEPTION_ARRAY_ELEMENTS_MISSING       = 0x02c;
        const EXCEPTION_TEMPLATE_ENGINE_UNSUPPORTED  = 0x02d;
-       const EXCEPTION_MISSING_LANGUAGE_HANDLER     = 0x02e;
-       const EXCEPTION_MISSING_FILE_IO_HANDLER      = 0x02f;
        const EXCEPTION_MISSING_ELEMENT              = 0x030;
        const EXCEPTION_HEADERS_ALREADY_SENT         = 0x031;
        const EXCEPTION_DEFAULT_CONTROLLER_GONE      = 0x032;
@@ -626,7 +624,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                if ((!isset($this->decimals)) || (!isset($this->thousands))) {
                        // Throw an exception
                        throw new MissingDecimalsThousandsSeperatorException($this, self::EXCEPTION_ATTRIBUTES_ARE_MISSING);
-               }
+               } // END - if
 
                // Cast the number
                $value = (float) $value;
@@ -667,7 +665,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        public final function addMissingTrailingSlash ($str) {
                // Is there a trailing slash?
-               if (substr($str, -1, 1) != '/') $str .= '/';
+               if (substr($str, -1, 1) != '/') {
+                       $str .= '/';
+               } // END - if
+
+               // Return string with trailing slash
                return $str;
        }
 
@@ -696,17 +698,15 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         *
         * @param               $appInstance                    An application helper instance or
         *                                                                              null if we shall use the default
-        * @return              $templateInstance                               The template engine instance
+        * @return              $templateInstance               The template engine instance
         * @throws              NullPointerException    If the template engine could not
         *                                                                              be initialized
         * @throws              UnsupportedTemplateEngineException      If $templateInstance is an
         *                                                                              unsupported template engine
-        * @throws              MissingLanguageHandlerException If the language sub-system
-        *                                                                              is not yet initialized
         * @throws              NullPointerException    If the discovered application
         *                                                                              instance is still null
         */
-       protected function prepareTemplateInstance (FrameworkInterface $appInstance=null) {
+       protected function prepareTemplateInstance (ManageableApplication $appInstance = null) {
                // Is the application instance set?
                if (is_null($appInstance)) {
                        // Get the current instance
@@ -719,15 +719,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        } // END - if
                } // END - if
 
-               // Are both instances set?
-               if ($appInstance->getLanguageInstance() === null) {
-                       // Invalid language instance
-                       throw new MissingLanguageHandlerException($appInstance, self::EXCEPTION_MISSING_LANGUAGE_HANDLER);
-               } elseif ($appInstance->getFileIoInstance() === null) {
-                       // Invalid language instance
-                       throw new MissingFileIoHandlerException($appInstance, self::EXCEPTION_MISSING_FILE_IO_HANDLER);
-               }
-
                // Initialize the template engine
                $templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class', array($appInstance));