Cleaning up outdated PHP

joomla · Sep 6, 2022 · f908f52 · f908f52
1 parent 76fea7f
commit f908f52
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 228 deletions.
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -1053,13 +1053,6 @@ public function getPhpOptions()
             $option->state  = strtolower(ini_get('mbstring.language')) === 'neutral';
             $option->notice = $option->state ? null : Text::_('INSTL_NOTICEMBLANGNOTDEFAULT');
             $options[] = $option;
-
-            // Check for MB function overload.
-            $option = new \stdClass();
-            $option->label  = Text::_('INSTL_MB_STRING_OVERLOAD_OFF');
-            $option->state  = ini_get('mbstring.func_overload') == 0;
-            $option->notice = $option->state ? null : Text::_('INSTL_NOTICEMBSTRINGOVERLOAD');
-            $options[] = $option;
         }
 
         // Check for a missing native parse_ini_file implementation.

diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -183,9 +183,7 @@ INSTL_EXTENSION_AVAILABLE="%s Available"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
 INSTL_PHP_VERSION_NEWER="PHP Version >= %s"

diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
@@ -42,11 +42,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."

diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
@@ -94,13 +94,6 @@ public function getPhpOptions()
             $option->state  = (strtolower(ini_get('mbstring.language')) == 'neutral');
             $option->notice = $option->state ? null : Text::_('INSTL_NOTICE_MBLANG_NOTDEFAULT');
             $options[] = $option;
-
-            // Check for MB function overload.
-            $option = new \stdClass();
-            $option->label  = Text::_('INSTL_MB_STRING_OVERLOAD_OFF');
-            $option->state  = (ini_get('mbstring.func_overload') == 0);
-            $option->notice = $option->state ? null : Text::_('INSTL_NOTICE_MBSTRING_OVERLOAD_OFF');
-            $options[] = $option;
         }
 
         // Check for a missing native parse_ini_file implementation.