Merge pull request #7 from mprins/scrutinizer-patch-1

Scrutinizer Auto-Fixes
mprins · Aug 29, 2016 · bc7daf7 · bc7daf7
2 parents 9f9ee9b + 3cc1075
commit bc7daf7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/_test/general.test.php b/_test/general.test.php
@@ -29,7 +29,7 @@ class general_plugin_geotag_test extends DokuWikiTest {
 	 * Simple test to make sure the plugin.info.txt is in correct format
 	 */
 	public function test_plugininfo() {
-		$file = __DIR__.'/../plugin.info.txt';
+		$file = __DIR__ . '/../plugin.info.txt';
 		$this->assertFileExists($file);
 
 		$info = confToHash($file);

diff --git a/_test/syntax.test.php b/_test/syntax.test.php
@@ -33,7 +33,7 @@ public static function setUpBeforeClass() {
 		global $conf;
 		$conf['allowdebug'] = 1;
 
-		TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
+		TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
 
 		dbglog("\nset up class syntax_plugin_geotag_test");
 	}
@@ -54,7 +54,7 @@ function setUp() {
 			idx_addPage($val['id'], $verbose, $force);
 		}
 		if ($conf['allowdebug']) {
-			touch(DOKU_TMP_DATA.'cache/debug.log');
+			touch(DOKU_TMP_DATA . 'cache/debug.log');
 		}
 	}
 
@@ -65,12 +65,12 @@ public function tearDown() {
 		// try to get the debug log after running the test, print and clear
 		if ($conf['allowdebug']) {
 			print "\n";
-			readfile(DOKU_TMP_DATA.'cache/debug.log');
-			unlink(DOKU_TMP_DATA.'cache/debug.log');
+			readfile(DOKU_TMP_DATA . 'cache/debug.log');
+			unlink(DOKU_TMP_DATA . 'cache/debug.log');
 		}
 	}
 
-	public function test_geotag(){
+	public function test_geotag() {
 		$request = new TestRequest();
 		$response = $request->get(array('id'=>'minimalgeotag'), '/doku.php');
 
@@ -87,7 +87,7 @@ public function test_geotag(){
 		);
 	}
 
-	public function test_fullgeotag(){
+	public function test_fullgeotag() {
 		$request = new TestRequest();
 		$response = $request->get(array('id'=>'fullgeotag'), '/doku.php');
 

diff --git a/conf/metadata.php b/conf/metadata.php
@@ -21,12 +21,12 @@
  * @license BSD license
  * @author Mark C. Prins <mprins@users.sf.net>
  */
-$meta ['geotag_pinggeourl']      = array ('onoff');
-$meta ['geotag_location_prefix'] = array ('string');
-$meta ['geotag_showlocation'] = array ('onoff');
-$meta ['geotag_hide']         = array ('onoff' );
-$meta ['geotag_prevent_microformat_render'] = array ('onoff' );
-$meta ['toolbar_icon']        = array ('onoff' );
-$meta ['geotag_showsearch']   = array ('onoff' );
-$meta ['displayformat']       = array ('multichoice',
-									'_choices' => array ('DD','DMS') );
+$meta ['geotag_pinggeourl']      = array('onoff');
+$meta ['geotag_location_prefix'] = array('string');
+$meta ['geotag_showlocation'] = array('onoff');
+$meta ['geotag_hide']         = array('onoff');
+$meta ['geotag_prevent_microformat_render'] = array('onoff');
+$meta ['toolbar_icon']        = array('onoff');
+$meta ['geotag_showsearch']   = array('onoff');
+$meta ['displayformat']       = array('multichoice',
+									'_choices' => array('DD', 'DMS'));
diff --git a/syntax/geotag.php b/syntax/geotag.php
@@ -117,8 +117,9 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
 	 * @see DokuWiki_Syntax_Plugin::render()
 	 */
 	public function render($mode, Doku_Renderer $renderer, $data) {
-		if ($data === false)
-			return false;
+		if ($data === false) {
+					return false;
+		}
 		list ($lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style) = $data;
 		$ddlat = $lat;
 		$ddlon = $lon;