From 500879520c40a71f0b83799ab3e59c86c12a801a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 28 Jul 2012 14:59:55 -0500
Subject: [ticket/10631] Metadata manager tests

PHPBB3-10631
---
 phpBB/includes/extension/metadata_manager.php | 59 ++++++++++++++-------------
 1 file changed, 30 insertions(+), 29 deletions(-)

(limited to 'phpBB/includes/extension/metadata_manager.php')

diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 27b04d4c08..c7f52b7c02 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -178,36 +178,37 @@ class phpbb_extension_metadata_manager
     		'version'	=> '#.+#',
     	);
 
-    	if (isset($fields[$name]))
+    	switch ($name)
     	{
-    		if (!isset($this->metadata[$name]))
-    		{
-    			throw new phpbb_extension_exception("Required meta field '$name' has not been set.");
-			}
-
-			if (!preg_match($fields[$name], $this->metadata[$name]))
-			{
-    			throw new phpbb_extension_exception("Meta field '$name' is invalid.");
-			}
-		}
-
-    	// Validate all fields
-    	if ($name == 'all')
-    	{
-    		$this->validate('display');
+    		case 'all':
+    			$this->validate('display');
 
-			$this->validate_enable();
-		}
+				$this->validate_enable();
+    		break;
 
-    	// Validate display fields
-    	if ($name == 'display')
-    	{
-    		foreach ($fields as $field => $data)
-			{
-				$this->validate($field);
-			}
+    		case 'display':
+    			foreach ($fields as $field => $data)
+				{
+					$this->validate($field);
+				}
 
-			$this->validate_authors();
+				$this->validate_authors();
+    		break;
+
+    		default:
+    			if (isset($fields[$name]))
+    			{
+    				if (!isset($this->metadata[$name]))
+    				{
+    					throw new phpbb_extension_exception("Required meta field '$name' has not been set.");
+					}
+
+					if (!preg_match($fields[$name], $this->metadata[$name]))
+					{
+    					throw new phpbb_extension_exception("Meta field '$name' is invalid.");
+					}
+				}
+			break;
 		}
 
 		return true;
@@ -218,7 +219,7 @@ class phpbb_extension_metadata_manager
 	 *
 	 * @return boolean True when passes validation, throws exception if invalid
 	 */
-	private function validate_authors()
+	public function validate_authors()
 	{
 		if (empty($this->metadata['authors']))
 		{
@@ -258,7 +259,7 @@ class phpbb_extension_metadata_manager
 	 *
 	 * @return boolean True when passes validation
 	 */
-	private function validate_require_phpbb()
+	public function validate_require_phpbb()
 	{
 		if (!isset($this->metadata['require']['phpbb']))
 		{
@@ -273,7 +274,7 @@ class phpbb_extension_metadata_manager
 	 *
 	 * @return boolean True when passes validation
 	 */
-	private function validate_require_php()
+	public function validate_require_php()
 	{
 		if (!isset($this->metadata['require']['php']))
 		{
-- 
cgit v1.2.1