Merge pull request #310 from VSEphpbb/updates

Minor post validation code fixes

Author: iMattPro

acp/boardrules_module.php

@@ -18,11 +18,14 @@ class boardrules_module
 
 	public function main($id, $mode)
 	{
-		global $phpbb_container, $request;
+		global $phpbb_container;
 
 		/** @var \phpbb\language\language $lang */
 		$lang = $phpbb_container->get('language');
 
+		/** @var \phpbb\request\request $request */
+		$request = $phpbb_container->get('request');
+
 		// Add the board rules ACP lang file
 		$lang->add_lang('boardrules_acp', 'phpbb/boardrules');
 

controller/admin_controller.php

@@ -293,6 +293,7 @@ public function add_rule($language = 0, $parent_id = 0)
 		add_form_key('add_edit_rule');
 
 		// Initiate a rule entity
+		/* @var $entity \phpbb\boardrules\entity\rule */
 		$entity = $this->container->get('phpbb.boardrules.entity');
 
 		// Collect the form data
@@ -459,7 +460,7 @@ protected function add_edit_rule_data($entity, $data)
 				}
 				catch (\phpbb\boardrules\exception\out_of_bounds $e)
 				{
-					trigger_error($e->get_message($this->user) . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($e->get_message($this->lang) . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				// Change rule parent
@@ -471,7 +472,7 @@ protected function add_edit_rule_data($entity, $data)
 					}
 					catch (\Exception $e)
 					{
-						trigger_error($this->user->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
+						trigger_error($this->lang->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
 					}
 				}
 
@@ -487,7 +488,7 @@ protected function add_edit_rule_data($entity, $data)
 				}
 				catch (\phpbb\boardrules\exception\out_of_bounds $e)
 				{
-					trigger_error($e->get_message($this->user) . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($e->get_message($this->lang) . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				// Show user confirmation of the added rule and provide link back to the previous page
@@ -555,7 +556,7 @@ public function delete_rule($rule_id)
 			}
 			catch (\Exception $e)
 			{
-				trigger_error($this->user->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
+				trigger_error($this->lang->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 
 			// Show user confirmation of the deleted rule and provide link back to the previous page
@@ -600,7 +601,7 @@ public function move_rule($rule_id, $direction, $amount = 1)
 		}
 		catch (\Exception $e)
 		{
-			trigger_error($this->user->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->lang->lang($e->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		// Send a JSON response if an AJAX request was used

operators/rule.php

@@ -74,7 +74,7 @@ public function get_rules($language = 0, $parent_id = 0)
 	* @param \phpbb\boardrules\entity\rule_interface $entity Rule entity with new data to insert
 	* @param int $language Language selection identifier; default: 0
 	* @param int $parent_id Category to display rules from; default: 0
-	* @return rule_interface Added rule entity
+	* @return \phpbb\boardrules\entity\rule_interface Added rule entity
 	* @access public
 	* @throws \phpbb\boardrules\exception\out_of_bounds
 	*/

tests/text_reparser/rule_text_test.php

@@ -10,7 +10,7 @@
 
 namespace phpbb\boardrules\tests\text_reparser;
 
-include_once dirname(__FILE__) . '/../../../../../../tests/text_reparser/plugins/test_row_based_plugin.php';
+include_once __DIR__ . '/../../../../../../tests/text_reparser/plugins/test_row_based_plugin.php';
 
 class rule_text_test extends \phpbb_textreparser_test_row_based_plugin
 {