Merge pull request phpbb#6687 from marc1706/ticket/12479

[ticket/12479] Remove deprecated functions
marc1706 · Jul 24, 2024 · 2afb6bd · 2afb6bd
2 parents 132bd6c + c36c6a2
commit 2afb6bd
Show file tree

Hide file tree

Showing 25 changed files with 407 additions and 1,338 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -383,14 +383,14 @@ jobs:
                       db: "mcr.microsoft.com/mssql/server:2019-latest"
                       db_alias: 'MSSQL 2019'
                     - php: '8.1'
-                      db: "mcr.microsoft.com/mssql/server:2022-latest"
+                      db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
                       db_alias: 'MSSQL 2022'
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
         services:
             mssql:
-                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
+                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
                 env:
                     SA_PASSWORD: "Pssw0rd_12"
                     ACCEPT_EULA: "y"
@@ -422,7 +422,7 @@ jobs:
               env:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ]
+                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
                   then
                       db='mssql'
                   else

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
@@ -651,38 +651,4 @@ function bbcode_second_pass_code($type, $code)
 
 		return $code;
 	}
-
-	/**
-	* Function to perform custom bbcode second pass by extensions
-	* can be used to assign bbcode pattern replacement
-	* Example: '#\[list=([^\[]+):$uid\]#e'	=> "\$this->bbcode_second_pass_by_extension('\$1')"
-	*
-	* Accepts variable number of parameters
-	*
-	* @return bool Second pass result
-	*
-	* @deprecated 3.2.10 (To be removed 4.0.0)
-	*/
-	function bbcode_second_pass_by_extension()
-	{
-		global $phpbb_dispatcher;
-
-		$return = false;
-		$params_array = func_get_args();
-
-		/**
-		* Event to perform bbcode second pass with
-		* the custom validating methods provided by extensions
-		*
-		* @event core.bbcode_second_pass_by_extension
-		* @var array	params_array	Array with the function parameters
-		* @var mixed	return			Second pass result to return
-		*
-		* @since 3.1.5-RC1
-		*/
-		$vars = array('params_array', 'return');
-		extract($phpbb_dispatcher->trigger_event('core.bbcode_second_pass_by_extension', compact($vars)));
-
-		return $return;
-	}
 }
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
@@ -49,8 +49,6 @@ function register_compatibility_globals()
 
 	/* @var $request \phpbb\request\request_interface */
 	$request = $phpbb_container->get('request');
-	// Inject request instance, so only this instance is used with request_var
-	request_var('', 0, false, false, $request);
 
 	/* @var $user \phpbb\user */
 	$user = $phpbb_container->get('user');
@@ -67,8 +65,6 @@ function register_compatibility_globals()
 	// Grab global variables, re-cache if necessary
 	/* @var $config phpbb\config\db */
 	$config = $phpbb_container->get('config');
-	set_config('', '', false, $config);
-	set_config_count('', 0, false, $config);
 
 	/* @var $phpbb_log \phpbb\log\log_interface */
 	$phpbb_log = $phpbb_container->get('log');