Type-hints fixed, header docs fixed, exceptions deprecated

[shipsimu.git] / application / selector / class_ApplicationSelector.php

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 9a8357da5075c8ea0e29bd94b3b5f7bda20d46b0..be289bf93f7e7cf9f467725f104bdf793ef005b1 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -9,7 +9,7 @@
  * @version            0.0.0
  * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.org
  *
  * 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
@@ -273,7 +273,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'tpl_engine'   => $tplEngine,
+                               'template_class'   => $tplEngine,
                                'app_instance' => $appInstance
                        ));
                }
@@ -315,9 +315,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @throws      NullPointerException            If $curr is null
         * @throws      NoArrayException                        If $curr is not an array
         * @throws      InvalidArrayCountException      If $curr contains an
-        *                                                                      unexpected count of elements
+        *                                                                              unexpected count of elements
         * @throws      MissingArrayElementsException   If $curr is missing expected
-        *                                                                      array elements
+        *                                                                                      array elements
         */
        public function insertApplicationTemplates () {
                // First prepare the instance
@@ -342,9 +342,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        } elseif (count($curr) != 2) {
                                // Not expected count of entries
                                throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-                       } elseif (!isset($curr['tpl_engine']) || (!isset($curr['app_instance']))) {
+                       } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
-                               throw new MissingArrayElementsException(array($this, "curr", array('tpl_engine', 'app_instance')), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
+                               throw new MissingArrayElementsException(array($this, "curr", array('template_class', 'app_instance')), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }
                        die("<pre>".print_r($curr, true)."</pre>");