MDL-71011 php80: final private makes no sense, throwing warning

Ref: https://php.watch/versions/8.0/final-private-function#final-private

This applies #712 from upstream libraries.

Unrelated: I've also changed a occurrence of "private final"
by the correct (PSR-12) "final private" in the constructor
(the final&private combination is allowed in constructors)
in lib/classes/event/base.php, because it's the unique case
in core and phpcs was really insisting.
This commit is contained in:
Eloy Lafuente (stronk7) 2021-03-27 18:16:07 +01:00
parent 91969d1e04
commit 59a8b7182b
5 changed files with 6 additions and 6 deletions

View File

@ -1125,7 +1125,7 @@ class ADODB_Active_Record {
*
* @return string The quoted name
*/
final private function nameQuoter($db,$string)
private function nameQuoter($db,$string)
{
global $ADODB_QUOTE_FIELDNAMES;

View File

@ -1944,7 +1944,7 @@ class ADORecordSet_db2 extends ADORecordSet {
}
final private function processCoreFetch()
private function processCoreFetch()
{
switch ($this->fetchMode){
case ADODB_FETCH_ASSOC:
@ -1970,7 +1970,7 @@ class ADORecordSet_db2 extends ADORecordSet {
}
}
final private function processMoveRecord()
private function processMoveRecord()
{
if (!$this->fields){
$this->EOF = true;

View File

@ -95,7 +95,7 @@ class ADODB_oci8po extends ADODB_oci8 {
*
* @return string The modified statement
*/
final private function extractBinds($sql,$inputarr)
private function extractBinds($sql,$inputarr)
{
$inString = false;
$escaped = 0;

View File

@ -297,7 +297,7 @@ class ADODB_pdo_firebird extends ADODB_pdo
* @param int $fprecision
* @param bool $dialect3
*/
final private function _convertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
private function _convertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
{
$fscale = abs($fscale);
$fld->max_length = $flen;

View File

@ -134,7 +134,7 @@ abstract class base implements \IteratorAggregate {
/**
* Private constructor, use create() or restore() methods instead.
*/
private final function __construct() {
final private function __construct() {
$this->data = array_fill_keys(self::$fields, null);
// Define some basic details.