[ticket/9556] Drop php closing tags, add trailing newline

Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556

build/build_diff.php

@@ -411,5 +411,3 @@ function run_command($command)
 	$result = trim(`$command`);
 	echo "\n- Command Run: " . $command . "\n";
 }
-
-?>

code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php

@@ -207,4 +207,4 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
             $phpcsFile->addError($message, $tags['license'][1]);            
         }
     }
-}
+}

code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php

@@ -48,4 +48,4 @@ class phpbb_Tests_Commenting_FileCommentUnitTest extends AbstractSniffUnitTest
             8  =>  1
         );
 	}//end getWarningList()
-}
+}

code_sniffer/phpbb/phpbbCodingStandard.php

@@ -40,4 +40,4 @@ class PHP_CodeSniffer_Standards_phpbb_phpbbCodingStandard extends PHP_CodeSniffe
     {
         return array();
     }
-}
+}

phpBB/adm/index.php

@@ -618,5 +618,3 @@ function validate_range($value_ary, &$error)
 		}
 	}
 }
-
-?>

phpBB/adm/style/acp_attachments.html

@@ -373,4 +373,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ban.html

@@ -121,4 +121,4 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_inactive.html

@@ -74,4 +74,4 @@
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_main.html

@@ -252,4 +252,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permission_roles.html

@@ -199,4 +199,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permissions.html

@@ -354,4 +354,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_php_info.html

@@ -10,4 +10,4 @@
 	{PHPINFO}
 </div>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_send_statistics.html

@@ -68,4 +68,4 @@ function iframe_updated()
 //]]>
 </script>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_update.html

@@ -49,4 +49,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_users_avatar.html

@@ -75,4 +75,4 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 	
-	</form>
+	</form>

phpBB/adm/style/acp_users_feedback.html

@@ -73,4 +73,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</fieldset>
 	{S_FORM_TOKEN}
-	</form>
+	</form>

phpBB/adm/style/acp_users_prefs.html

@@ -155,4 +155,4 @@
 		{S_FORM_TOKEN}
 	</fieldset>
 
-	</form>
+	</form>

phpBB/adm/style/acp_users_profile.html

@@ -63,4 +63,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-	</form>
+	</form>

phpBB/adm/style/acp_users_signature.html

@@ -114,4 +114,4 @@
 		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-</form>
+</form>

phpBB/adm/style/colour_swatch.html

@@ -75,4 +75,4 @@
 </script>
 
 </body>
-</html>
+</html>

phpBB/adm/style/editor.js

@@ -400,4 +400,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
+}

phpBB/adm/style/install_convert.html

@@ -131,4 +131,4 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_error.html

@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_footer.html

@@ -24,4 +24,4 @@
 </div>
 
 </body>
-</html>
+</html>

phpBB/adm/style/install_main.html

@@ -3,4 +3,4 @@
 	<h1>{TITLE}</h1>
 	<p>{BODY}</p>
 
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_update_diff.html

@@ -259,4 +259,4 @@ table.hrdiff caption span {
 	</div>
 
 
-<!-- INCLUDE simple_footer.html -->
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/style/message_body.html

@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/overall_footer.html

@@ -32,4 +32,4 @@
 </div>
 
 </body>
-</html>
+</html>

phpBB/adm/style/permission_roles_mask.html

@@ -35,4 +35,4 @@
 	
 	<p>{L_ROLE_NOT_ASSIGNED}</p>
 
-<!-- END role_mask -->
+<!-- END role_mask -->

phpBB/adm/style/progress_bar.html

@@ -37,4 +37,4 @@
 // ]]>
 </script>
 
-<!-- INCLUDE simple_footer.html -->
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/style/simple_body.html

@@ -5,4 +5,4 @@
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
-<!-- INCLUDE simple_footer.html -->
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/style/viewsource.html

@@ -18,4 +18,4 @@
 </div>
 </div>
 </div>
-<!-- INCLUDE simple_footer.html -->
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/swatch.php

@@ -49,5 +49,3 @@ $template->assign_vars(array(
 $template->display('body');
 
 garbage_collection();
-
-?>

phpBB/common.php

@@ -237,5 +237,3 @@ foreach ($cache->obtain_hooks() as $hook)
 {
 	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
-
-?>

phpBB/cron.php

@@ -283,5 +283,3 @@ function unlock_cron()
 		WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
 	$db->sql_query($sql);
 }
-
-?>

phpBB/develop/add_permissions.php

@@ -413,5 +413,3 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 	unset($sql_ary);
 
 }
-
-?>

phpBB/develop/adjust_avatars.php

@@ -143,5 +143,3 @@ function adjust_avatar($old_name, $midfix)
 	}
 	return false;
 }
-
-?>

phpBB/develop/adjust_bbcodes.php

@@ -170,5 +170,3 @@ $db->sql_freeresult($result);
 
 // Done
 $db->sql_close();
-
-?>

phpBB/develop/adjust_magic_urls.php

@@ -122,5 +122,3 @@ $db->sql_freeresult($result);
 
 // Done
 $db->sql_close();
-
-?>

phpBB/develop/adjust_sizes.php

@@ -128,5 +128,3 @@ $db->sql_freeresult($result);
 
 // Done
 $db->sql_close();
-
-?>

phpBB/develop/adjust_smilies.php

@@ -126,5 +126,3 @@ $db->sql_freeresult($result);
 
 // Done
 $db->sql_close();
-
-?>

phpBB/develop/adjust_uids.php

@@ -126,4 +126,3 @@ $db->sql_freeresult($result);
 // Done
 $db->sql_close();
 echo 'done';
-?>

phpBB/develop/adjust_usernames.php

@@ -48,5 +48,3 @@ echo 'FINISHED';
 
 // Done
 $db->sql_close();
-
-?>

phpBB/develop/benchmark.php

@@ -458,5 +458,3 @@ function make_user($username)
 	}
 
 }
-
-?>

phpBB/develop/calc_email_hash.php

@@ -72,5 +72,3 @@ do
 while ($start);
 
 echo "<p><b>Done</b></p>\n";
- 
-?>

phpBB/develop/change_smiley_ref.php

@@ -58,5 +58,3 @@ while ($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 
 echo "<p><b>Done</b></p>\n";
- 
-?>

phpBB/develop/create_schema_files.php

@@ -2047,5 +2047,3 @@ EOF;
 }
 
 echo 'done';
-
-?>

phpBB/develop/create_variable_overview.php

@@ -543,5 +543,3 @@ fclose($fp);
 
 echo '<br>Finished!';
 flush();
-
-?>

phpBB/develop/fill.php

@@ -186,5 +186,3 @@ function rndm_username()
 
 	return $usernames[array_rand($usernames)];
 }
-
-?>

phpBB/develop/generate_utf_casefold.php

@@ -152,5 +152,3 @@ function download($url)
 
 	echo "\n";
 }
-
-?>

phpBB/develop/generate_utf_confusables.php

@@ -240,5 +240,3 @@ function download($url)
 
 	echo "\n";
 }
-
-?>

phpBB/develop/generate_utf_tables.php

@@ -569,4 +569,4 @@ function cp_to_utf($cp)
 	{
 		return chr($cp);
 	}
-}
+}

phpBB/develop/lang_duplicates.php

@@ -137,4 +137,4 @@ function find_modules($dirname)
 
 ?>
 	</body>
-</html>
+</html>

phpBB/develop/merge_attachment_tables.php

@@ -76,5 +76,3 @@ $db->sql_query($sql);
 //$db->sql_query("DROP TABLE {$table_prefix}attach_temp");
 
 echo "<p><b>Done</b></p>\n";
- 
-?>

phpBB/develop/merge_post_tables.php

@@ -205,5 +205,3 @@ foreach ($sql_ary as $sql)
 }
 
 echo "<p><b>Done</b></p>\n";
- 
-?>

phpBB/develop/mysql_upgrader.php

@@ -1398,5 +1398,3 @@ function get_schema_struct()
 
 	return $schema_data;
 }
-
-?>

phpBB/develop/nuke-db.php

@@ -54,5 +54,3 @@ else
 		flush();
 	}
 }
-?>
-

phpBB/develop/regex.php

@@ -80,5 +80,3 @@ echo 'www.URL: ' . $www_url . "<br />\n";
 // no schema and no authority
 $relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
 echo 'relative URL: ' . $relative_url . "<br />\n";
-
-?>

phpBB/develop/remove-php-end-tags.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# Remove ending PHP tags '?>'
+# @author Oleg Pudeyev
+# @license http://opensource.org/licenses/gpl-license.php GNU Public License
+
+import sys, os, os.path, optparse
+
+def error(message, code):
+    print >>sys.stderr, message
+    exit(code)
+
+
+parser = optparse.OptionParser()
+parser.add_option('-a', '--aggressive', help='Remove ending tags when they are followed by whitespace', action='store_true')
+options, args = parser.parse_args()
+
+if len(args) != 1:
+    parser.usage()
+    error("Usage: remove-php-end-tags path", 2)
+
+path = args[0]
+
+if not os.path.exists(path):
+    error("Path does not exist: %s" % path, 3)
+
+if options.aggressive:
+    import re
+    
+    fix_re = re.compile(r'\s*\?>\s*$')
+    def fix_content(content):
+        content = fix_re.sub(r'\n', content)
+        return content
+else:
+    def fix_content(content):
+        if content.endswith('?>'):
+            content = content[:-2].strip() + "\n"
+        return content
+
+def process_file(path):
+    f = open(path)
+    try:
+        content = f.read()
+    finally:
+        f.close()
+    fixed_content = fix_content(content)
+    if content != fixed_content:
+        f = open(path, 'w')
+        try:
+            f.write(fixed_content)
+        finally:
+            f.close()
+
+def process_dir(path):
+    for root, dirs, files in os.walk(path):
+        if '.svn' in dirs:
+            dirs.remove('.svn')
+        for file in files:
+            if file.endswith('.php'):
+                path = os.path.join(root, file)
+                process_file(path)
+
+if os.path.isdir(path):
+    process_dir(path)
+else:
+    process_file(path)

phpBB/develop/repair_bots.php

@@ -147,5 +147,3 @@ function add_bots($bots)
 		}
 	}
 }
-
-?>

phpBB/develop/unicode_testing.php

@@ -116,5 +116,3 @@ function utf8_normalize_nfkc($strings)
 
 	return $strings;
 }
-
-?>

phpBB/develop/update_email_hash.php

@@ -54,4 +54,3 @@ echo 'FINISHED';
 
 // Done
 $db->sql_close();
-?>

phpBB/develop/utf_normalizer_test.php

@@ -388,4 +388,4 @@ function cp_to_utf($cp)
 	{
 		return chr($cp);
 	}
-}
+}

phpBB/download/file.php

@@ -309,5 +309,3 @@ else
 		file_gc();
 	}
 }
-
-?>

phpBB/faq.php

@@ -85,5 +85,3 @@ $template->set_filenames(array(
 make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));
 
 page_footer();
-
-?>

phpBB/feed.php

@@ -1489,6 +1489,3 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
 	}
 }
-
-
-?>

phpBB/includes/acm/acm_apc.php

@@ -80,5 +80,3 @@ class acm extends acm_memory
 		return apc_delete($this->key_prefix . $var);
 	}
 }
-
-?>

phpBB/includes/acm/acm_eaccelerator.php

@@ -117,5 +117,3 @@ class acm extends acm_memory
 		return eaccelerator_rm($this->key_prefix . $var);
 	}
 }
-
-?>

phpBB/includes/acm/acm_file.php

@@ -728,5 +728,3 @@ class acm
 		return @unlink($filename);
 	}
 }
-
-?>

phpBB/includes/acm/acm_memcache.php

@@ -134,5 +134,3 @@ class acm extends acm_memory
 		return $this->memcache->delete($this->key_prefix . $var);
 	}
 }
-
-?>

phpBB/includes/acm/acm_memory.php

@@ -435,5 +435,3 @@ class acm_memory
 		return true;
 	}
 }
-
-?>

phpBB/includes/acm/acm_null.php

@@ -152,5 +152,3 @@ class acm
 		return false;
 	}
 }
-
-?>

phpBB/includes/acm/acm_xcache.php

@@ -117,5 +117,3 @@ class acm extends acm_memory
 		return xcache_isset($this->key_prefix . $var);
 	}
 }
-
-?>

phpBB/includes/acp/acp_attachments.php

@@ -1456,5 +1456,3 @@ class acp_attachments
 	}
 
 }
-
-?>

phpBB/includes/acp/acp_ban.php

@@ -248,5 +248,3 @@ class acp_ban
 		);
 	}
 }
-
-?>

phpBB/includes/acp/acp_bbcodes.php

@@ -472,5 +472,3 @@ class acp_bbcodes
 		);
 	}
 }
-
-?>

phpBB/includes/acp/acp_board.php

@@ -985,5 +985,3 @@ class acp_board
 	}
 
 }
-
-?>

phpBB/includes/acp/acp_bots.php

@@ -414,5 +414,3 @@ class acp_bots
 		return ($row) ? false : true;
 	}
 }
-
-?>

phpBB/includes/acp/acp_captcha.php

@@ -144,5 +144,3 @@ class acp_captcha
 		exit_handler();
 	}
 }
-
-?>

phpBB/includes/acp/acp_database.php

@@ -2455,5 +2455,3 @@ function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
 
 	return false;
 }
-
-?>

phpBB/includes/acp/acp_disallow.php

@@ -104,5 +104,3 @@ class acp_disallow
 		);
 	}
 }
-
-?>

phpBB/includes/acp/acp_email.php

@@ -258,5 +258,3 @@ class acp_email
 
 	}
 }
-
-?>

phpBB/includes/acp/acp_forums.php

@@ -1950,5 +1950,3 @@ class acp_forums
 	}
 
 }
-
-?>

phpBB/includes/acp/acp_groups.php

@@ -794,5 +794,3 @@ class acp_groups
 		}
 	}
 }
-
-?>

phpBB/includes/acp/acp_icons.php

@@ -951,5 +951,3 @@ class acp_icons
 		return $item_count;
 	}
 }
-
-?>

phpBB/includes/acp/acp_inactive.php

@@ -308,5 +308,3 @@ class acp_inactive
 		$this->page_title = 'ACP_INACTIVE_USERS';
 	}
 }
-
-?>

phpBB/includes/acp/acp_jabber.php

@@ -127,5 +127,3 @@ class acp_jabber
 		));
 	}
 }
-
-?>

phpBB/includes/acp/acp_language.php

@@ -1469,5 +1469,3 @@ $lang = array_merge($lang, array(
 		return $entry;
 	}
 }
-
-?>

phpBB/includes/acp/acp_logs.php

@@ -173,5 +173,3 @@ class acp_logs
 		}
 	}
 }
-
-?>

phpBB/includes/acp/acp_main.php

@@ -613,5 +613,3 @@ class acp_main
 		$this->page_title = 'ACP_MAIN';
 	}
 }
-
-?>

phpBB/includes/acp/acp_modules.php

@@ -1061,5 +1061,3 @@ class acp_modules
 		return $this->lang_name($target['module_langname']);
 	}
 }
-
-?>

phpBB/includes/acp/acp_permission_roles.php

@@ -567,5 +567,3 @@ class acp_permission_roles
 		$auth_admin->acl_clear_prefetch();
 	}
 }
-
-?>

phpBB/includes/acp/acp_permissions.php

@@ -1312,5 +1312,3 @@ class acp_permissions
 		);
 	}
 }
-
-?>

phpBB/includes/acp/acp_php_info.php

@@ -80,5 +80,3 @@ class acp_php_info
 		$template->assign_var('PHPINFO', $output);
 	}
 }
-
-?>

phpBB/includes/acp/acp_profile.php

@@ -1625,5 +1625,3 @@ class acp_profile
 		return $sql;
 	}
 }
-
-?>

phpBB/includes/acp/acp_prune.php

@@ -462,5 +462,3 @@ class acp_prune
 		$db->sql_freeresult($result);
 	}
 }
-
-?>

phpBB/includes/acp/acp_ranks.php

@@ -236,5 +236,3 @@ class acp_ranks
 
 	}
 }
-
-?>

phpBB/includes/acp/acp_reasons.php

@@ -371,5 +371,3 @@ class acp_reasons
 		$db->sql_freeresult($result);
 	}
 }
-
-?>

phpBB/includes/acp/acp_search.php

@@ -625,5 +625,3 @@ class acp_search
 		return $error;
 	}
 }
-
-?>

phpBB/includes/acp/acp_send_statistics.php

@@ -86,5 +86,3 @@ class acp_send_statistics
 		}
 	}
 }
-
-?>