Merge pull request #61 from VSEphpbb/updates

Some more updates

Author: iMattPro

build.xml

@@ -26,7 +26,7 @@
 	</target>
 
 	<!--
-	TODO: DO NOT EDIT BELOW THIS LINE!!!!
+	DO NOT EDIT BELOW THIS LINE!!!!
 	-->
 
 	<property name="version" value="HEAD" override="true" />

event/listener.php

@@ -71,7 +71,7 @@ public function load_google_analytics()
 	/**
 	* Add config vars to ACP Board Settings
 	*
-	* @param object $event The event object
+	* @param \phpbb\event\data $event The event object
 	* @return null
 	* @access public
 	*/
@@ -81,7 +81,7 @@ public function add_googleanalytics_configs($event)
 		$this->user->add_lang_ext('phpbb/googleanalytics', 'googleanalytics_acp');
 
 		// Add a config to the settings mode, after board_timezone
-		if ($event['mode'] == 'settings' && isset($event['display_vars']['vars']['board_timezone']))
+		if ($event['mode'] === 'settings' && isset($event['display_vars']['vars']['board_timezone']))
 		{
 			// Store display_vars event in a local variable
 			$display_vars = $event['display_vars'];
@@ -108,7 +108,7 @@ public function add_googleanalytics_configs($event)
 	/**
 	* Validate the Google Analytics ID
 	*
-	* @param object $event The event object
+	* @param \phpbb\event\data $event The event object
 	* @return null
 	* @access public
 	*/
@@ -117,7 +117,7 @@ public function validate_googleanalytics_id($event)
 		$input = $event['cfg_array']['googleanalytics_id'];
 
 		// Check if the validate test is for google_analytics
-		if (($event['config_definition']['validate'] == 'googleanalytics_id') && ($input !== ''))
+		if ($input !== '' && $event['config_definition']['validate'] === 'googleanalytics_id')
 		{
 			// Store the error and input event data
 			$error = $event['error'];

tests/event/listener_test.php

@@ -10,7 +10,7 @@
 
 namespace phpbb\googleanalytics\tests\event;
 
-require_once dirname(__FILE__) . '/../../../../../includes/functions_acp.php';
+require_once __DIR__ . '/../../../../../includes/functions_acp.php';
 
 class event_listener_test extends \phpbb_test_case
 {