From 0b21f0345e55e61a70306a2e1ad1bf7031c0add0 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Sun, 26 Nov 2023 09:35:31 -0600 Subject: [PATCH] Reversions (#14) * Revert "Deprecations for PHP 8.1" This reverts commit aed862e95fd286c53cc546734868dc38ff4b5b1d. Changes need to instead be done in pear-core. * Revert "fix: typo in _parseFeaturesHeaderFile" This reverts commit ce667358e146f249c3f9533f71cdecc1f5236df0. Changes need to instead be done in pear-core. --- src/OS/Guess.php | 2 +- src/PEAR.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OS/Guess.php b/src/OS/Guess.php index 0e37a09..88cd659 100644 --- a/src/OS/Guess.php +++ b/src/OS/Guess.php @@ -245,7 +245,7 @@ function _readGlibCVersionFromFeaturesHeaderFile() return array(); } if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) { - return $this->_parseFeaturesHeaderFile($features_header_file); + return $this-_parseFeaturesHeaderFile($features_header_file); } // no cpp return $this->_fromGlibCTest(); diff --git a/src/PEAR.php b/src/PEAR.php index 27b1b4b..6dba3b0 100644 --- a/src/PEAR.php +++ b/src/PEAR.php @@ -219,7 +219,7 @@ public function __call($method, $arguments) ); } return call_user_func_array( - array(self::class, '_' . $method), + array(get_class(), '_' . $method), array_merge(array($this), $arguments) ); } @@ -232,7 +232,7 @@ public static function __callStatic($method, $arguments) ); } return call_user_func_array( - array(self::class, '_' . $method), + array(get_class(), '_' . $method), array_merge(array(null), $arguments) ); }