From 7bfc47b5ad99ea3c5d9f2ca1092f0b0b822b4ead Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 11 Mar 2009 02:13:15 +0000 Subject: [PATCH 1/1] is_null() removed which is obsolete --- application/selector/class_ApplicationSelector.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 071da88..7af3eee 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -247,10 +247,9 @@ class ApplicationSelector extends BaseFrameworkSystem { * Inserts all loaded application templates into the selector's template * * @return void - * @throws NullPointerException If $curr is null - * @throws NoArrayException If $curr is not an array - * @throws InvalidArrayCountException If $curr contains an - * unexpected count of elements + * @throws NoArrayException If $curr is not an array + * @throws InvalidArrayCountException If $curr contains an + * unexpected count of elements * @throws MissingArrayElementsException If $curr is missing expected * array elements * @todo Finish handling all applications here @@ -269,10 +268,7 @@ class ApplicationSelector extends BaseFrameworkSystem { $curr = $idx->current(); // Do some sanity checks on the loaded item - if (is_null($curr)) { - // $curr is null - throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); - } elseif (!is_array($curr)) { + if (!is_array($curr)) { // Not an array throw new NoArrayException($curr, self::EXCEPTION_IS_NO_ARRAY); } elseif (count($curr) != 2) { -- 2.39.2