From 0181a33816af5cf90a3a79308916a3daf1c6d7b2 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 29 Jan 2009 11:49:12 -0500 Subject: [PATCH] no need to return null in these methods --- framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Grabber.php | 1 - framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php | 2 -- framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Pointer.php | 1 - framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Scalar.php | 4 ---- framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Separator.php | 4 ---- framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php | 1 - 6 files changed, 13 deletions(-) diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Grabber.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Grabber.php index 3ef477077..ba81bd626 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Grabber.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Grabber.php @@ -27,7 +27,6 @@ class Horde_Date_Parser_Locale_Base_Grabber extends Horde_Date_Parser_Tag return new self($scannerTag); } } - return null; } public function __toString() diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php index b98aacc62..1b75d49ca 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php @@ -23,7 +23,6 @@ class Horde_Date_Parser_Locale_Base_Ordinal extends Horde_Date_Parser_Tag if (preg_match($this->ordinalRegex, $token->word, $matches)) { return new self((int)$matches[1]); } - return null; } public function scanForDays($token) @@ -34,7 +33,6 @@ class Horde_Date_Parser_Locale_Base_Ordinal extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_OrdinalDay((int)$m[1]); } } - return null; } public function __toString() diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Pointer.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Pointer.php index f902efca2..9a548838d 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Pointer.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Pointer.php @@ -24,7 +24,6 @@ class Horde_Date_Parser_Locale_Base_Pointer extends Horde_Date_Parser_Tag return new self($scannerTag); } } - return null; } public function __toString() diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Scalar.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Scalar.php index 7ae60467b..54038820d 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Scalar.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Scalar.php @@ -34,7 +34,6 @@ class Horde_Date_Parser_Locale_Base_Scalar extends Horde_Date_Parser_Tag return new self((int)$token->word); } } - return null; } public function scanForDays($token, $postToken) @@ -44,7 +43,6 @@ class Horde_Date_Parser_Locale_Base_Scalar extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_ScalarDay((int)$token->word); } } - return null; } public function scanForMonths($token, $postToken) @@ -54,7 +52,6 @@ class Horde_Date_Parser_Locale_Base_Scalar extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_ScalarMonth((int)$token->word); } } - return null; } public function scanForYears($token, $postToken) @@ -64,7 +61,6 @@ class Horde_Date_Parser_Locale_Base_Scalar extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_ScalarYear((int)$token->word); } } - return null; } public function __toString() diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Separator.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Separator.php index b0d263265..6914bfa30 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Separator.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Separator.php @@ -42,7 +42,6 @@ class Horde_Date_Parser_Locale_Base_Separator extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_SeparatorComma($scannerTag); } } - return null; } public function scanForSlashOrDash($token) @@ -53,7 +52,6 @@ class Horde_Date_Parser_Locale_Base_Separator extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_SeparatorSlashOrDash($scannerTag); } } - return null; } public function scanForAt($token) @@ -64,7 +62,6 @@ class Horde_Date_Parser_Locale_Base_Separator extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_SeparatorAt($scannerTag); } } - return null; } public function scanForIn($token) @@ -75,7 +72,6 @@ class Horde_Date_Parser_Locale_Base_Separator extends Horde_Date_Parser_Tag return new Horde_Date_Parser_Locale_Base_SeparatorIn($scannerTag); } } - return null; } public function __toString() diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php index b3429f433..bd7d15561 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php @@ -22,7 +22,6 @@ class Horde_Date_Parser_Locale_Base_Timezone extends Horde_Date_Parser_Tag return new self($scannerTag); } } - return null; } public function __toString() -- 2.11.0