diff options
Diffstat (limited to 'includes/libs')
| -rw-r--r-- | includes/libs/Deflate.php | 6 | ||||
| -rw-r--r-- | includes/libs/filebackend/fsfile/TempFSFileFactory.php | 5 | ||||
| -rw-r--r-- | includes/libs/lockmanager/FSLockManager.php | 6 | ||||
| -rw-r--r-- | includes/libs/mime/MSCompoundFileReader.php | 10 | ||||
| -rw-r--r-- | includes/libs/mime/MimeAnalyzer.php | 13 | ||||
| -rw-r--r-- | includes/libs/objectcache/utils/MemcachedClient.php | 5 |
6 files changed, 27 insertions, 18 deletions
diff --git a/includes/libs/Deflate.php b/includes/libs/Deflate.php index 333091e23039..e54864b4a388 100644 --- a/includes/libs/Deflate.php +++ b/includes/libs/Deflate.php @@ -16,6 +16,8 @@ * */ +use Wikimedia\AtEase\AtEase; + /** * Server-side helper for client-side compressed content. * @@ -60,9 +62,9 @@ class Deflate { if ( $deflated === false ) { return StatusValue::newFatal( 'deflate-invaliddeflate' ); } - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $inflated = gzinflate( $deflated ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $inflated === false ) { return StatusValue::newFatal( 'deflate-invaliddeflate' ); } diff --git a/includes/libs/filebackend/fsfile/TempFSFileFactory.php b/includes/libs/filebackend/fsfile/TempFSFileFactory.php index 1120973803ee..10def1a0aadb 100644 --- a/includes/libs/filebackend/fsfile/TempFSFileFactory.php +++ b/includes/libs/filebackend/fsfile/TempFSFileFactory.php @@ -3,6 +3,7 @@ namespace MediaWiki\FileBackend\FSFile; use TempFSFile; +use Wikimedia\AtEase\AtEase; /** * @ingroup FileBackend @@ -38,9 +39,9 @@ class TempFSFileFactory { while ( $attempts-- ) { $hex = sprintf( '%06x%06x', mt_rand( 0, 0xffffff ), mt_rand( 0, 0xffffff ) ); $path = "$tmpDirectory/$prefix$hex$ext"; - \Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $newFileHandle = fopen( $path, 'x' ); - \Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $newFileHandle ) { fclose( $newFileHandle ); $tmpFile = new TempFSFile( $path ); diff --git a/includes/libs/lockmanager/FSLockManager.php b/includes/libs/lockmanager/FSLockManager.php index c94fa55cc8b5..8cec36de0f1e 100644 --- a/includes/libs/lockmanager/FSLockManager.php +++ b/includes/libs/lockmanager/FSLockManager.php @@ -21,6 +21,8 @@ * @ingroup LockManager */ +use Wikimedia\AtEase\AtEase; + /** * Simple version of LockManager based on using FS lock files. * All locks are non-blocking, which avoids deadlocks. @@ -122,7 +124,7 @@ class FSLockManager extends LockManager { if ( isset( $this->handles[$path] ) ) { $handle = $this->handles[$path]; } else { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $handle = fopen( $this->getLockPath( $path ), 'a+' ); if ( !$handle && !is_dir( $this->lockDir ) ) { // Create the lock directory in case it is missing @@ -132,7 +134,7 @@ class FSLockManager extends LockManager { $this->logger->error( "Cannot create directory '{$this->lockDir}'." ); } } - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); } if ( $handle ) { // Either a shared or exclusive lock diff --git a/includes/libs/mime/MSCompoundFileReader.php b/includes/libs/mime/MSCompoundFileReader.php index 7a5a900ae2db..121994a2152a 100644 --- a/includes/libs/mime/MSCompoundFileReader.php +++ b/includes/libs/mime/MSCompoundFileReader.php @@ -14,6 +14,8 @@ * specific language governing permissions and limitations under the License. */ +use Wikimedia\AtEase\AtEase; + /** * Read the directory of a Microsoft Compound File Binary file, a.k.a. an OLE * file, and detect the MIME type. @@ -216,9 +218,9 @@ class MSCompoundFileReader { private function readOffset( $offset, $length ) { $this->fseek( $offset ); - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $block = fread( $this->file, $length ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $block === false ) { $this->error( 'error reading from file', self::ERROR_READ ); } @@ -243,9 +245,9 @@ class MSCompoundFileReader { } private function fseek( $offset ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $result = fseek( $this->file, $offset ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $result !== 0 ) { $this->error( "unable to seek to offset $offset", self::ERROR_SEEK ); } diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php index dfe331c22507..9b994c0e01ef 100644 --- a/includes/libs/mime/MimeAnalyzer.php +++ b/includes/libs/mime/MimeAnalyzer.php @@ -22,6 +22,7 @@ use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; +use Wikimedia\AtEase\AtEase; use Wikimedia\Mime\MimeMap; use Wikimedia\Mime\MimeMapMinimal; @@ -545,9 +546,9 @@ class MimeAnalyzer implements LoggerAwareInterface { */ private function doGuessMimeType( string $file, $ext ) { // Read a chunk of the file - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $f = fopen( $file, 'rb' ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( !$f ) { return 'unknown/unknown'; @@ -681,9 +682,9 @@ class MimeAnalyzer implements LoggerAwareInterface { /** * look for XML formats (XHTML and SVG) */ - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $xml = new XmlTypeCheck( $file ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $xml->wellFormed ) { $xmlTypes = $this->xmlTypes; return $xmlTypes[$xml->getRootElement()] ?? 'application/xml'; @@ -759,9 +760,9 @@ class MimeAnalyzer implements LoggerAwareInterface { } } - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); $gis = getimagesize( $file ); - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); if ( $gis && isset( $gis['mime'] ) ) { $mime = $gis['mime']; diff --git a/includes/libs/objectcache/utils/MemcachedClient.php b/includes/libs/objectcache/utils/MemcachedClient.php index 0edafe0308e6..345104bc15d8 100644 --- a/includes/libs/objectcache/utils/MemcachedClient.php +++ b/includes/libs/objectcache/utils/MemcachedClient.php @@ -68,6 +68,7 @@ use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; +use Wikimedia\AtEase\AtEase; use Wikimedia\IPUtils; // {{{ class MemcachedClient @@ -800,13 +801,13 @@ class MemcachedClient { $timeout = $this->_connect_timeout; $errno = $errstr = null; for ( $i = 0; !$sock && $i < $this->_connect_attempts; $i++ ) { - Wikimedia\suppressWarnings(); + AtEase::suppressWarnings(); if ( $this->_persistent == 1 ) { $sock = pfsockopen( $ip, $port, $errno, $errstr, $timeout ); } else { $sock = fsockopen( $ip, $port, $errno, $errstr, $timeout ); } - Wikimedia\restoreWarnings(); + AtEase::restoreWarnings(); } if ( !$sock ) { $this->_error_log( "Error connecting to $host: $errstr" ); |