diff --git src/wp-includes/ID3/module.audio-video.quicktime.php src/wp-includes/ID3/module.audio-video.quicktime.php index d6e0eda7dd..2082186d6d 100644 --- src/wp-includes/ID3/module.audio-video.quicktime.php +++ src/wp-includes/ID3/module.audio-video.quicktime.php @@ -207,7 +207,7 @@ class getid3_quicktime extends getid3_handler } } } - if ($info['audio']['dataformat'] == 'mp4') { + if ($info['audio']['dataformat'] === 'mp4') { $info['fileformat'] = 'mp4'; if (empty($info['video']['resolution_x'])) { $info['mime_type'] = 'audio/mp4'; @@ -289,7 +289,7 @@ class getid3_quicktime extends getid3_handler // some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted $allnumericnames = true; foreach ($atom_structure['subatoms'] as $subatomarray) { - if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) { + if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) !== 1)) { $allnumericnames = false; break; } @@ -949,7 +949,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['sample_description_table'][$i]['video_pixel_color_type'] = (((int) $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color'); $atom_structure['sample_description_table'][$i]['video_pixel_color_name'] = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']); - if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') { + if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] !== 'invalid') { $info['quicktime']['video']['codec_fourcc'] = $atom_structure['sample_description_table'][$i]['data_format']; $info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']); $info['quicktime']['video']['codec'] = (((int) $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']); @@ -2114,7 +2114,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['ES_DescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1)); $esds_offset += 1; - if ($atom_structure['ES_DescrTag'] != 0x03) { + if ($atom_structure['ES_DescrTag'] !== 0x03) { $this->warning('expecting esds.ES_DescrTag = 0x03, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DescrTag']).'), at offset '.$atom_structure['offset']); break; } @@ -2143,7 +2143,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['ES_DecoderConfigDescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1)); $esds_offset += 1; - if ($atom_structure['ES_DecoderConfigDescrTag'] != 0x04) { + if ($atom_structure['ES_DecoderConfigDescrTag'] !== 0x04) { $this->warning('expecting esds.ES_DecoderConfigDescrTag = 0x04, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecoderConfigDescrTag']).'), at offset '.$atom_structure['offset']); break; } @@ -2174,7 +2174,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['ES_DecSpecificInfoTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1)); $esds_offset += 1; - if ($atom_structure['ES_DecSpecificInfoTag'] != 0x05) { + if ($atom_structure['ES_DecSpecificInfoTag'] !== 0x05) { $this->warning('expecting esds.ES_DecSpecificInfoTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecSpecificInfoTag']).'), at offset '.$atom_structure['offset']); break; } @@ -2185,7 +2185,7 @@ $this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in $atom_structure['ES_SLConfigDescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1)); $esds_offset += 1; - if ($atom_structure['ES_SLConfigDescrTag'] != 0x06) { + if ($atom_structure['ES_SLConfigDescrTag'] !== 0x06) { $this->warning('expecting esds.ES_SLConfigDescrTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_SLConfigDescrTag']).'), at offset '.$atom_structure['offset']); break; } @@ -2918,18 +2918,18 @@ $this->error('fragmented mp4 files not currently supported'); } $info = &$this->getid3->info; $comment_key = ''; - if ($boxname && ($boxname != $keyname)) { + if ($boxname && ($boxname !== $keyname)) { $comment_key = (isset($handyatomtranslatorarray[$boxname]) ? $handyatomtranslatorarray[$boxname] : $boxname); } elseif (isset($handyatomtranslatorarray[$keyname])) { $comment_key = $handyatomtranslatorarray[$keyname]; } if ($comment_key) { - if ($comment_key == 'picture') { + if ($comment_key === 'picture') { // already copied directly into [comments][picture] elsewhere, do not re-copy here return true; } $gooddata = array($data); - if ($comment_key == 'genre') { + if ($comment_key === 'genre') { // some other taggers separate multiple genres with semicolon, e.g. "Heavy Metal;Thrash Metal;Metal" $gooddata = explode(';', $data); } diff --git src/wp-includes/ID3/module.audio-video.riff.php src/wp-includes/ID3/module.audio-video.riff.php index a94ae24d0c..c9b875f70b 100644 --- src/wp-includes/ID3/module.audio-video.riff.php +++ src/wp-includes/ID3/module.audio-video.riff.php @@ -82,7 +82,7 @@ class getid3_riff extends getid3_handler //$info['fileformat'] = 'riff'; $this->container = 'riff'; $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize); - if ($RIFFsubtype == 'RMP3') { + if ( 'RMP3' === $RIFFsubtype ) { // RMP3 is identical to WAVE, just renamed. Used by [unknown program] when creating RIFF-MP3s $RIFFsubtype = 'WAVE'; } @@ -1516,20 +1516,20 @@ class getid3_riff extends getid3_handler // the rest is all hardcoded(?) and does not appear to be useful until you get to audio info at offset 256, even then everything is probably hardcoded - if (substr($AMVheader, 68, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") { + if (substr($AMVheader, 68, 20) !== 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") { throw new Exception('expecting "LIST<0x00000000>strlstrh<0x38000000>" at offset '.($startoffset + 68).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 68, 20)).'"'); } // followed by 56 bytes of null: substr($AMVheader, 88, 56) -> 144 - if (substr($AMVheader, 144, 8) != 'strf'."\x24\x00\x00\x00") { + if (substr($AMVheader, 144, 8) !== 'strf'."\x24\x00\x00\x00") { throw new Exception('expecting "strf<0x24000000>" at offset '.($startoffset + 144).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 144, 8)).'"'); } // followed by 36 bytes of null: substr($AMVheader, 144, 36) -> 180 - if (substr($AMVheader, 188, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x30\x00\x00\x00") { + if (substr($AMVheader, 188, 20) !== 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x30\x00\x00\x00") { throw new Exception('expecting "LIST<0x00000000>strlstrh<0x30000000>" at offset '.($startoffset + 188).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 188, 20)).'"'); } // followed by 48 bytes of null: substr($AMVheader, 208, 48) -> 256 - if (substr($AMVheader, 256, 8) != 'strf'."\x14\x00\x00\x00") { + if (substr($AMVheader, 256, 8) !== 'strf'."\x14\x00\x00\x00") { throw new Exception('expecting "strf<0x14000000>" at offset '.($startoffset + 256).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 256, 8)).'"'); } // followed by 20 bytes of a modified WAVEFORMATEX: @@ -1601,11 +1601,11 @@ class getid3_riff extends getid3_handler $this->error('Expecting chunk name at offset '.($this->ftell() - 8).' but found nothing. Aborting RIFF parsing.'); break; } - if (($chunksize == 0) && ($chunkname != 'JUNK')) { + if (($chunksize === 0) && ($chunkname !== 'JUNK')) { $this->warning('Chunk ('.$chunkname.') size at offset '.($this->ftell() - 4).' is zero. Aborting RIFF parsing.'); break; } - if (($chunksize % 2) != 0) { + if (($chunksize % 2) !== 0) { // all structures are packed on word boundaries $chunksize++; } @@ -1624,7 +1624,7 @@ class getid3_riff extends getid3_handler $AudioChunkStreamType = substr($AudioChunkHeader, 2, 2); $AudioChunkSize = getid3_lib::LittleEndian2Int(substr($AudioChunkHeader, 4, 4)); - if ($AudioChunkStreamType == 'wb') { + if ($AudioChunkStreamType === 'wb') { $FirstFourBytes = substr($AudioChunkHeader, 8, 4); if (preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', $FirstFourBytes)) { // MP3 @@ -1815,7 +1815,7 @@ class getid3_riff extends getid3_handler if ($chunksize < 1048576) { if ($chunksize > 0) { $RIFFchunk[$chunkname][$thisindex]['data'] = $this->fread($chunksize); - if ($chunkname == 'JUNK') { + if ( 'JUNK' === $chunkname ) { if (preg_match('#^([\\x20-\\x7F]+)#', $RIFFchunk[$chunkname][$thisindex]['data'], $matches)) { // only keep text characters [chr(32)-chr(127)] $info['riff']['comments']['junk'][] = trim($matches[1]); @@ -1899,7 +1899,7 @@ class getid3_riff extends getid3_handler $info['riff']['comments'][$key] = array($RIFFchunk[$chunkname][$thisindex]['parsed'][$key]); } } - if ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] && !empty($info['filesize']) && ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] != $info['filesize'])) { + if ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] && !empty($info['filesize']) && ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] !== $info['filesize'])) { $this->warning('RIFF.WAVE.scot.filelength ('.$RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'].') different from actual filesize ('.$info['filesize'].')'); } break; diff --git src/wp-includes/ID3/module.audio.flac.php src/wp-includes/ID3/module.audio.flac.php index 014061da94..f3f944344d 100644 --- src/wp-includes/ID3/module.audio.flac.php +++ src/wp-includes/ID3/module.audio.flac.php @@ -34,7 +34,7 @@ class getid3_flac extends getid3_handler $this->fseek($info['avdataoffset']); $StreamMarker = $this->fread(4); - if ($StreamMarker != self::syncword) { + if ($StreamMarker !== self::syncword) { return $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($StreamMarker).'"'); } $info['fileformat'] = 'flac'; @@ -65,7 +65,7 @@ class getid3_flac extends getid3_handler break; } if ($BlockLength < 1) { - if ($BlockTypeText != 'reserved') { + if ($BlockTypeText !== 'reserved') { // probably supposed to be zero-length $this->warning('METADATA_BLOCK_HEADER.BLOCK_LENGTH ('.$BlockTypeText.') at offset '.$BlockOffset.' is zero bytes'); continue;