Packager script for latest dev version added, misc fixes, captcha verifier filter...

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

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 928fcda608222ec3bbd246ee3013a79cca61e532..651b2a4c359a68ed9d62f0ec9f8c5ef2852bd715 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -121,10 +121,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @param               $initScript     The FQFN of init.php
         * @param               $appName                The application's Uni* name
         * @return      void
-        * @throws      AppVarIsNotSetException If 'app' is not set
-        * @throws      NullPointerException    If 'app' is null
-        * @throws      NoObjectException               If 'app' is not an object
-        * @throws      MissingMethodException  If a required method is missing
         */
        private function loadInitScript ($initScript, $appName) {
                // Is it a file and readable?
@@ -132,21 +128,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        // Then include it
                        include ($initScript);
 
-                       // We now should have $app re-defined!
-                       if (!isset($app)) {
-                               // This application shall not be loaded
-                               return;
-                       } elseif (is_null($app)) {
-                               // The class instance is null
-                               throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-                       } elseif (!is_object($app)) {
-                               // Not an object
-                               throw new NoObjectException($app, self::EXCEPTION_IS_NO_OBJECT);
-                       } elseif (!method_exists($app, $this->getConfigInstance()->readConfig('entry_method'))) {
-                               // Method not found!
-                               throw new MissingMethodException(array($app, $this->getConfigInstance()->readConfig('entry_method')), self::EXCEPTION_MISSING_METHOD);
-                       }
-
                        // Add the current instance to the list
                        $this->foundApps->append($app);
 
@@ -315,9 +296,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
@@ -344,7 +325,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                                throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
                        } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
-                               throw new MissingArrayElementsException(array($this, "curr", array('template_class', '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>");