Merge pull request #79 from VSEphpbb/fixes

Code and Bug Fixes

Author: iMattPro

.travis.yml

@@ -47,7 +47,7 @@ branches:
     - /^\d+(\.\d+)?\.x$/
 
 install:
-  - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - travis/prepare-phpbb.sh $PHPBB_BRANCH
   - cd ../../phpBB3
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS

event/listener.php

@@ -125,7 +125,7 @@ public function add_googleanalytics_configs($event)
 	*/
 	public function validate_googleanalytics_id($event)
 	{
-		$input = $event['cfg_array']['googleanalytics_id'];
+		$input = isset($event['cfg_array']['googleanalytics_id']) ? $event['cfg_array']['googleanalytics_id'] : '';
 
 		// Check if the validate test is for google_analytics
 		if ($input !== '' && $event['config_definition']['validate'] === 'googleanalytics_id')

tests/event/listener_test.php

@@ -12,7 +12,7 @@
 
 require_once __DIR__ . '/../../../../../includes/functions_acp.php';
 
-class event_listener_test extends \phpbb_test_case
+class listener_test extends \phpbb_test_case
 {
 	/** @var \phpbb\googleanalytics\event\listener */
 	protected $listener;
@@ -199,6 +199,11 @@ public function validate_googleanalytics_id_data()
 				array('googleanalytics_id' => 'foo-bar-foo'),
 				array('ACP_GOOGLEANALYTICS_ID_INVALID'),
 			),
+			array(
+				// no googleanalytics_id, no error
+				array('foo' => 'bar'),
+				array(),
+			),
 		);
 	}
 
@@ -211,7 +216,7 @@ public function test_validate_googleanalytics_id($cfg_array, $expected_error)
 	{
 		$this->set_listener();
 
-		$config_name = 'googleanalytics_id';
+		$config_name = key($cfg_array);
 		$config_definition = array('validate' => 'googleanalytics_id');
 		$error = array();
 

travis/prepare-epv.sh

@@ -14,7 +14,7 @@ set -x
 EPV=$1
 NOTESTS=$2
 
-if [ "$EPV" == "1" -a "$NOTESTS" == "1" ]
+if [ "$EPV" == "1" ] && [ "$NOTESTS" == "1" ]
 then
 	cd phpBB
 	composer remove sami/sami --update-with-dependencies --dev --no-interaction

travis/prepare-phpbb.sh

@@ -11,14 +11,12 @@
 set -e
 set -x
 
-EXTNAME=$1
-BRANCH=$2
-EXTPATH_TEMP=$3
+BRANCH=$1
 
 # Copy extension to a temp folder
 mkdir ../../tmp
 cp -R . ../../tmp
 cd ../../
 
 # Clone phpBB
-git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch=$BRANCH
+git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch="$BRANCH"