Merge branch '3.1.x' into 3.2.x

Nicofuma · Nicofuma · commit 43ba6783c5cb · 2017-01-15T18:16:36.000+01:00
* 3.1.x:
  [ticket/15011] Output meaningful errors when validating all metadata
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
@@ -214,9 +214,19 @@ public function validate($name = 'display')
 			case 'all':
 				$this->validate('display');
 
-				if (!$this->validate_enable())
+				if (!$this->validate_dir())
 				{
-					throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array($name));
+					throw new \phpbb\extension\exception('EXTENSION_DIR_INVALID');
+				}
+
+				if (!$this->validate_require_phpbb())
+				{
+					throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('soft-require'));
+				}
+
+				if (!$this->validate_require_php())
+				{
+					throw new \phpbb\extension\exception('META_FIELD_NOT_SET', array('require php'));
 				}
 			break;
 
