From 59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 29 Sep 2014 21:45:27 +0200 Subject: more scrutinizer issue improvements --- inc/JpegMeta.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index a35ec3ed0..3b6c6694c 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -42,6 +42,7 @@ class JpegMeta { var $_fileName; var $_fp = null; + var $_fpout = null; var $_type = 'unknown'; var $_markers; @@ -527,12 +528,12 @@ class JpegMeta { /** * Get the image's title, tries various fields * - * @param int $max maximum number chars (keeps words) + * @param int $max maximum number chars (keeps words) + * @return bool|mixed|string + * * @author Andreas Gohr */ function getTitle($max=80){ - $cap = ''; - // try various fields $cap = $this->getField(array('Iptc.Headline', 'Iptc.Caption', @@ -560,6 +561,7 @@ class JpegMeta { $this->_parseAll(); if ($this->_markers == null) { if (@isset($this->_info['file']['UnixTime'])) { + $dates = array(); $dates['FileModified'] = $this->_info['file']['UnixTime']; $dates['Time'] = $this->_info['file']['UnixTime']; $dates['TimeSource'] = 'FileModified'; @@ -1334,7 +1336,6 @@ class JpegMeta { return false; } - $pos = 0; $this->_info['jfif'] = array(); $vmaj = $this->_getByte($data, 5); @@ -1420,7 +1421,6 @@ class JpegMeta { break; default: return false; - break; } $this->_info['sof']['Format'] = $format; -- cgit v1.2.3 From 42ea7f447f39fbc2f79eaaec31f8c10ede59c5d0 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 1 Oct 2014 11:30:27 +0200 Subject: Many PHPDocs, some unused and dyn declared vars many PHPDocs some unused variables some dynamically declared variables declared --- inc/JpegMeta.php | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 3b6c6694c..d50bad9b7 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -133,6 +133,9 @@ class JpegMeta { * through one function * * @author Andreas Gohr + * + * @param array|string $fields field name or array with field names + * @return bool|string */ function getField($fields) { if(!is_array($fields)) $fields = array($fields); @@ -178,6 +181,10 @@ class JpegMeta { * through one function * * @author Andreas Gohr + * + * @param string $field field name + * @param string $value + * @return bool success or fail */ function setField($field, $value) { if(strtolower(substr($field,0,5)) == 'iptc.'){ @@ -194,6 +201,9 @@ class JpegMeta { * through one function * * @author Andreas Gohr + * + * @param string $field field name + * @return bool */ function deleteField($field) { if(strtolower(substr($field,0,5)) == 'iptc.'){ @@ -209,6 +219,9 @@ class JpegMeta { * Return a date field * * @author Andreas Gohr + * + * @param string $field + * @return false|string */ function getDateField($field) { if (!isset($this->_info['dates'])) { @@ -226,6 +239,9 @@ class JpegMeta { * Return a file info field * * @author Andreas Gohr + * + * @param string $field field name + * @return false|string */ function getFileField($field) { if (!isset($this->_info['file'])) { @@ -244,6 +260,8 @@ class JpegMeta { * * @author Andreas Gohr * @todo handle makernotes + * + * @return false|string */ function getCamera(){ $make = $this->getField(array('Exif.Make','Exif.TIFFMake')); @@ -257,6 +275,8 @@ class JpegMeta { * Return shutter speed as a ratio * * @author Joe Lapp + * + * @return string */ function getShutterSpeed() { if (!isset($this->_info['exif'])) { @@ -275,6 +295,9 @@ class JpegMeta { * Return an EXIF field * * @author Sebastian Delmont + * + * @param string $field field name + * @return false|string */ function getExifField($field) { if (!isset($this->_info['exif'])) { @@ -296,6 +319,9 @@ class JpegMeta { * Return an XMP field * * @author Hakan Sandell + * + * @param string $field field name + * @return false|string */ function getXmpField($field) { if (!isset($this->_info['xmp'])) { @@ -317,6 +343,9 @@ class JpegMeta { * Return an Adobe Field * * @author Sebastian Delmont + * + * @param string $field field name + * @return false|string */ function getAdobeField($field) { if (!isset($this->_info['adobe'])) { @@ -338,6 +367,9 @@ class JpegMeta { * Return an IPTC field * * @author Sebastian Delmont + * + * @param string $field field name + * @return false|string */ function getIPTCField($field) { if (!isset($this->_info['iptc'])) { @@ -360,6 +392,10 @@ class JpegMeta { * * @author Sebastian Delmont * @author Joe Lapp + * + * @param string $field field name + * @param string $value + * @return bool */ function setExifField($field, $value) { if (!isset($this->_info['exif'])) { @@ -390,6 +426,10 @@ class JpegMeta { * Set an Adobe Field * * @author Sebastian Delmont + * + * @param string $field field name + * @param string $value + * @return bool */ function setAdobeField($field, $value) { if (!isset($this->_info['adobe'])) { @@ -414,6 +454,10 @@ class JpegMeta { * dimensions * * @author Andreas Gohr + * + * @param int $maxwidth + * @param int $maxheight + * @return float|int */ function getResizeRatio($maxwidth,$maxheight=0){ if(!$maxheight) $maxheight = $maxwidth; @@ -443,6 +487,10 @@ class JpegMeta { * Set an IPTC field * * @author Sebastian Delmont + * + * @param string $field field name + * @param string $value + * @return bool */ function setIPTCField($field, $value) { if (!isset($this->_info['iptc'])) { @@ -466,6 +514,9 @@ class JpegMeta { * Delete an EXIF field * * @author Sebastian Delmont + * + * @param string $field field name + * @return bool */ function deleteExifField($field) { if (!isset($this->_info['exif'])) { @@ -487,6 +538,9 @@ class JpegMeta { * Delete an Adobe field * * @author Sebastian Delmont + * + * @param string $field field name + * @return bool */ function deleteAdobeField($field) { if (!isset($this->_info['adobe'])) { @@ -508,6 +562,9 @@ class JpegMeta { * Delete an IPTC field * * @author Sebastian Delmont + * + * @param string $field field name + * @return bool */ function deleteIPTCField($field) { if (!isset($this->_info['iptc'])) { @@ -529,7 +586,7 @@ class JpegMeta { * Get the image's title, tries various fields * * @param int $max maximum number chars (keeps words) - * @return bool|mixed|string + * @return false|string * * @author Andreas Gohr */ @@ -556,6 +613,8 @@ class JpegMeta { * Gather various date fields * * @author Sebastian Delmont + * + * @return array|bool */ function getDates() { $this->_parseAll(); @@ -692,6 +751,8 @@ class JpegMeta { * Get the image width, tries various fields * * @author Sebastian Delmont + * + * @return false|string */ function getWidth() { if (!isset($this->_info['sof'])) { @@ -721,6 +782,8 @@ class JpegMeta { * Get the image height, tries various fields * * @author Sebastian Delmont + * + * @return false|string */ function getHeight() { if (!isset($this->_info['sof'])) { @@ -750,6 +813,8 @@ class JpegMeta { * Get an dimension string for use in img tag * * @author Sebastian Delmont + * + * @return false|string */ function getDimStr() { if ($this->_markers == null) { @@ -766,6 +831,9 @@ class JpegMeta { * Checks for an embedded thumbnail * * @author Sebastian Delmont + * + * @param string $which possible values: 'any', 'exif' or 'adobe' + * @return false|string */ function hasThumbnail($which = 'any') { if (($which == 'any') || ($which == 'exif')) { @@ -807,6 +875,9 @@ class JpegMeta { * Send embedded thumbnail to browser * * @author Sebastian Delmont + * + * @param string $which possible values: 'any', 'exif' or 'adobe' + * @return bool */ function sendThumbnail($which = 'any') { $data = null; @@ -857,6 +928,9 @@ class JpegMeta { * * @author Sebastian Delmont * @author Andreas Gohr + * + * @param string $fileName file name or empty string for a random name + * @return bool */ function save($fileName = "") { if ($fileName == "") { -- cgit v1.2.3 From 79e79377626799a77c11aa7849cb9c64305590c8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 7 Jan 2015 10:47:45 +0100 Subject: Remove error supression for file_exists() In an older version of PHP a file_exists() call would issue a warning when the file did not exist. This was fixed in later PHP releases. Since we require PHP 5.3 now, there's no need to supress any error here anymore. This might even give a minor performance boost. --- inc/JpegMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index d50bad9b7..4cdebcc36 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -936,7 +936,7 @@ class JpegMeta { if ($fileName == "") { $tmpName = tempnam(dirname($this->_fileName),'_metatemp_'); $this->_writeJPEG($tmpName); - if (@file_exists($tmpName)) { + if (file_exists($tmpName)) { return io_rename($tmpName, $this->_fileName); } } else { -- cgit v1.2.3 From 276820f70d7e96ee375735c1a15bdc0a8331a5a7 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Sat, 10 Jan 2015 14:47:51 +0000 Subject: Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- inc/JpegMeta.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 4cdebcc36..cd082cbba 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1106,6 +1106,10 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param string $outputName + */ function _writeJPEG($outputName) { $this->_parseAll(); @@ -1238,6 +1242,12 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $marker + * @param integer $length + * @param integer $origLength + */ function _writeJPEGMarker($marker, $length, &$data, $origLength) { if ($length <= 0) { return false; @@ -1565,6 +1575,7 @@ class JpegMeta { * Parses XMP nodes by recursion * * @author Hakan Sandell + * @param integer $count */ function _parseXmpNode($values, &$i, &$meta, $count) { if ($values[$i]['type'] == 'close') return; @@ -1668,6 +1679,12 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $base + * @param boolean $isBigEndian + * @param string $mode + */ function _readIFD($data, $base, $offset, $isBigEndian, $mode) { $EXIFTags = $this->_exifTagNames($mode); @@ -1923,6 +1940,12 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $offsetBase + * @param boolean $isBigEndian + * @param boolean $hasNext + */ function _writeIFD(&$data, $pos, $offsetBase, &$entries, $isBigEndian, $hasNext) { $tiffData = null; $tiffDataOffsetPos = -1; @@ -1979,6 +2002,11 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param boolean $isBigEndian + * @param string $mode + */ function & _getIFDEntries($isBigEndian, $mode) { $EXIFNames = $this->_exifTagNames($mode); $EXIFTags = $this->_exifNameTags($mode); @@ -2487,6 +2515,10 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $pos + */ function _write8BIM(&$data, $pos, $type, $header, &$value) { $signature = "8BIM"; @@ -2547,6 +2579,10 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $pos + */ function _writeIPTCEntry(&$data, $pos, $type, &$value) { $pos = $this->_putShort($data, $pos, 0x1C02); $pos = $this->_putByte($data, $pos, $type); @@ -2907,11 +2943,19 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $pos + */ function _getByte(&$data, $pos) { return ord($data{$pos}); } /*************************************************************/ + + /** + * @param integer $pos + */ function _putByte(&$data, $pos, $val) { $val = intval($val); @@ -2947,6 +2991,10 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $pos + */ function _getLong(&$data, $pos, $bigEndian = true) { if ($bigEndian) { return (ord($data{$pos}) << 24) @@ -2962,6 +3010,10 @@ class JpegMeta { } /*************************************************************/ + + /** + * @param integer $pos + */ function _putLong(&$data, $pos, $val, $bigEndian = true) { $val = intval($val); -- cgit v1.2.3 From 5c3b310dea6f5a4712e4b9bc1f3d6d198c057ee0 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 15 May 2015 19:32:40 +0200 Subject: more class constructors to __construct() --- inc/JpegMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index cd082cbba..1fa4f25ce 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -54,7 +54,7 @@ class JpegMeta { * * @author Sebastian Delmont */ - function JpegMeta($fileName) { + function __construct($fileName) { $this->_fileName = $fileName; -- cgit v1.2.3