diff --git a/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php b/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php
index 209aba3646..36544b93da 100644
--- a/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php
+++ b/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php
@@ -20,7 +20,7 @@ class add_display_unapproved_posts_config extends \phpbb\db\migration\migration
 		return $this->config->offsetExists('display_unapproved_posts');
 	}
 
-	public static function depends_on()
+	static public function depends_on()
 	{
 		return ['\phpbb\db\migration\data\v330\dev',];
 	}
diff --git a/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php b/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php
index c136960905..5bce86457e 100644
--- a/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php
+++ b/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php
@@ -24,7 +24,7 @@ class remove_attachment_flash extends \phpbb\db\migration\migration
 		self::ATTACHMENT_CATEGORY_FLASH,
 	);
 
-	public static function depends_on()
+	static public function depends_on()
 	{
 		return ['\phpbb\db\migration\data\v330\dev',];
 	}
diff --git a/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php b/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php
index 10e5ee385d..c820645004 100644
--- a/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php
+++ b/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php
@@ -20,7 +20,7 @@ class remove_max_pass_chars extends \phpbb\db\migration\migration
 		return !$this->config->offsetExists('max_pass_chars');
 	}
 
-	public static function depends_on()
+	static public function depends_on()
 	{
 		return [
 			'\phpbb\db\migration\data\v330\dev',
diff --git a/phpBB/phpbb/db/migration/data/v33x/default_search_return_chars.php b/phpBB/phpbb/db/migration/data/v33x/default_search_return_chars.php
index ec1e7af11f..9175c384dc 100644
--- a/phpBB/phpbb/db/migration/data/v33x/default_search_return_chars.php
+++ b/phpBB/phpbb/db/migration/data/v33x/default_search_return_chars.php
@@ -20,7 +20,7 @@ class default_search_return_chars extends \phpbb\db\migration\migration
 		return $this->config->offsetExists('default_search_return_chars');
 	}
 
-	public static function depends_on()
+	static public function depends_on()
 	{
 		return [
 			'\phpbb\db\migration\data\v330\v330',
diff --git a/phpBB/phpbb/db/migration/data/v33x/google_recaptcha_v3.php b/phpBB/phpbb/db/migration/data/v33x/google_recaptcha_v3.php
index 65499cc402..e1362ed813 100644
--- a/phpBB/phpbb/db/migration/data/v33x/google_recaptcha_v3.php
+++ b/phpBB/phpbb/db/migration/data/v33x/google_recaptcha_v3.php
@@ -20,7 +20,7 @@ class google_recaptcha_v3 extends \phpbb\db\migration\migration
 		return $this->config->offsetExists('recaptcha_v3_key');
 	}
 
-	public static function depends_on()
+	static public function depends_on()
 	{
 		return [
 			'\phpbb\db\migration\data\v330\v330',
diff --git a/phpBB/phpbb/db/tools/mssql.php b/phpBB/phpbb/db/tools/mssql.php
index 29f816a869..1653abeec0 100644
--- a/phpBB/phpbb/db/tools/mssql.php
+++ b/phpBB/phpbb/db/tools/mssql.php
@@ -30,7 +30,7 @@ class mssql extends tools
 	 *
 	 * @return array
 	 */
-	public static function get_dbms_type_map()
+	static public function get_dbms_type_map()
 	{
 		return array(
 			'mssql'		=> array(
diff --git a/phpBB/phpbb/db/tools/postgres.php b/phpBB/phpbb/db/tools/postgres.php
index 7cb024d4f6..0c02a05d56 100644
--- a/phpBB/phpbb/db/tools/postgres.php
+++ b/phpBB/phpbb/db/tools/postgres.php
@@ -24,7 +24,7 @@ class postgres extends tools
 	 *
 	 * @return array
 	 */
-	public static function get_dbms_type_map()
+	static public function get_dbms_type_map()
 	{
 		return array(
 			'postgres'	=> array(
diff --git a/phpBB/phpbb/debug/debug.php b/phpBB/phpbb/debug/debug.php
index c5ffada2e5..5e11c27586 100644
--- a/phpBB/phpbb/debug/debug.php
+++ b/phpBB/phpbb/debug/debug.php
@@ -24,7 +24,7 @@ use Symfony\Component\Debug\ExceptionHandler;
  */
 class debug
 {
-	private static $enabled = false;
+	static private $enabled = false;
 
 	/**
 	 * Enables the debug tools.
@@ -37,7 +37,7 @@ class debug
 	 * @param int  $errorReportingLevel The level of error reporting you want
 	 * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
 	 */
-	public static function enable($errorReportingLevel = null, $displayErrors = true)
+	static public function enable($errorReportingLevel = null, $displayErrors = true)
 	{
 		if (static::$enabled)
 		{