enmi-conf.org: comparison wp/wp-includes/pomo/streams.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 		public $_post  = '';
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct() {
+		public function __construct() {
 			if ( function_exists( 'mb_substr' )
 				&& ( (int) ini_get( 'mbstring.func_overload' ) & 2 ) // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
 			) {
 				$this->is_overloaded = true;
 			} else {
 		/**
 		 * Sets the endianness of the file.
 		 *
 		 * @param string $endian Set the endianness of the file. Accepts 'big', or 'little'.
 		 */
-		function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+		public function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
 			$this->endian = $endian;
 		}
 		/**
 		 * Reads a 32bit Integer from the Stream
 		 *
 		 * @return mixed The integer, corresponding to the next 32 bits from
 		 *  the stream of false if there are not enough bytes or on error
 		 */
-		function readint32() {
+		public function readint32() {
 			$bytes = $this->read( 4 );
 			if ( 4 != $this->strlen( $bytes ) ) {
 				return false;
 			}
 			$endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
 		 *
 		 * @param int $count How many elements should be read
 		 * @return mixed Array of integers or false if there isn't
 		 *  enough data or on error
 		 */
-		function readint32array( $count ) {
+		public function readint32array( $count ) {
 			$bytes = $this->read( 4 * $count );
 			if ( 4 * $count != $this->strlen( $bytes ) ) {
 				return false;
 			}
 			$endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
 		 * @param string $string
 		 * @param int    $start
 		 * @param int    $length
 		 * @return string
 		 */
-		function substr( $string, $start, $length ) {
+		public function substr( $string, $start, $length ) {
 			if ( $this->is_overloaded ) {
 				return mb_substr( $string, $start, $length, 'ascii' );
 			} else {
 				return substr( $string, $start, $length );
 			}
 		/**
 		 * @param string $string
 		 * @return int
 		 */
-		function strlen( $string ) {
+		public function strlen( $string ) {
 			if ( $this->is_overloaded ) {
 				return mb_strlen( $string, 'ascii' );
 			} else {
 				return strlen( $string );
 			}
 		/**
 		 * @param string $string
 		 * @param int    $chunk_size
 		 * @return array
 		 */
-		function str_split( $string, $chunk_size ) {
+		public function str_split( $string, $chunk_size ) {
 			if ( ! function_exists( 'str_split' ) ) {
 				$length = $this->strlen( $string );
 				$out    = array();
 				for ( $i = 0; $i < $length; $i += $chunk_size ) {
 					$out[] = $this->substr( $string, $i, $chunk_size );
 		}
 		/**
 		 * @return int
 		 */
-		function pos() {
+		public function pos() {
 			return $this->_pos;
 		}
 		/**
 		 * @return true
 		 */
-		function is_resource() {
+		public function is_resource() {
 			return true;
 		}
 		/**
 		 * @return true
 		 */
-		function close() {
+		public function close() {
 			return true;
 		}
 	}
 endif;
 	class POMO_FileReader extends POMO_Reader {
 		/**
 		 * @param string $filename
 		 */
-		function __construct( $filename ) {
+		public function __construct( $filename ) {
 			parent::__construct();
 			$this->_f = fopen( $filename, 'rb' );
 		}
 		/**
 		/**
 		 * @param int $bytes
 		 * @return string|false Returns read string, otherwise false.
 		 */
-		function read( $bytes ) {
+		public function read( $bytes ) {
 			return fread( $this->_f, $bytes );
 		}
 		/**
 		 * @param int $pos
 		 * @return bool
 		 */
-		function seekto( $pos ) {
+		public function seekto( $pos ) {
 			if ( -1 == fseek( $this->_f, $pos, SEEK_SET ) ) {
 				return false;
 			}
 			$this->_pos = $pos;
 			return true;
 		}
 		/**
 		 * @return bool
 		 */
-		function is_resource() {
+		public function is_resource() {
 			return is_resource( $this->_f );
 		}
 		/**
 		 * @return bool
 		 */
-		function feof() {
+		public function feof() {
 			return feof( $this->_f );
 		}
 		/**
 		 * @return bool
 		 */
-		function close() {
+		public function close() {
 			return fclose( $this->_f );
 		}
 		/**
 		 * @return string
 		 */
-		function read_all() {
+		public function read_all() {
-			$all = '';
+			return stream_get_contents( $this->_f );
-			while ( ! $this->feof() ) {
-				$all .= $this->read( 4096 );
-			}
-			return $all;
 		}
 	}
 endif;
 if ( ! class_exists( 'POMO_StringReader', false ) ) :
 		public $_str = '';
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct( $str = '' ) {
+		public function __construct( $str = '' ) {
 			parent::__construct();
 			$this->_str = $str;
 			$this->_pos = 0;
 		}
 		/**
 		 * @param string $bytes
 		 * @return string
 		 */
-		function read( $bytes ) {
+		public function read( $bytes ) {
 			$data        = $this->substr( $this->_str, $this->_pos, $bytes );
 			$this->_pos += $bytes;
 			if ( $this->strlen( $this->_str ) < $this->_pos ) {
 				$this->_pos = $this->strlen( $this->_str );
 			}
 		/**
 		 * @param int $pos
 		 * @return int
 		 */
-		function seekto( $pos ) {
+		public function seekto( $pos ) {
 			$this->_pos = $pos;
 			if ( $this->strlen( $this->_str ) < $this->_pos ) {
 				$this->_pos = $this->strlen( $this->_str );
 			}
 			return $this->_pos;
 		}
 		/**
 		 * @return int
 		 */
-		function length() {
+		public function length() {
 			return $this->strlen( $this->_str );
 		}
 		/**
 		 * @return string
 		 */
-		function read_all() {
+		public function read_all() {
 			return $this->substr( $this->_str, $this->_pos, $this->strlen( $this->_str ) );
 		}
 	}
 endif;
 	 */
 	class POMO_CachedFileReader extends POMO_StringReader {
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct( $filename ) {
+		public function __construct( $filename ) {
 			parent::__construct();
 			$this->_str = file_get_contents( $filename );
 			if ( false === $this->_str ) {
 				return false;
 			}
 		 *
 		 * @deprecated 5.4.0 Use __construct() instead.
 		 *
 		 * @see POMO_CachedIntFileReader::__construct()
 		 */
-		function POMO_CachedIntFileReader( $filename ) {
+		public function POMO_CachedIntFileReader( $filename ) {
 			_deprecated_constructor( self::class, '5.4.0', static::class );
 			self::__construct( $filename );
 		}
 	}
 endif;

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6