diff --git a/Model/Behavior/ShellUploadBehavior.php b/Model/Behavior/ShellUploadBehavior.php index 27ef12bc..e1ca09b1 100644 --- a/Model/Behavior/ShellUploadBehavior.php +++ b/Model/Behavior/ShellUploadBehavior.php @@ -16,7 +16,7 @@ class ShellUploadBehavior extends UploadBehavior { * @param array $options The options array * @return string */ - public function path(Model $model, $field, $options = []) { + public function path(Model $model, $field, $options = array()) { return parent::_path($model, $field, $options); } @@ -33,4 +33,4 @@ public function path(Model $model, $field, $options = []) { public function createThumbnails(Model $model, $field, $path, $thumbnailPath) { return parent::_createThumbnails($model, $field, $path, $thumbnailPath); } -} \ No newline at end of file +} diff --git a/Model/Behavior/UploadBehavior.php b/Model/Behavior/UploadBehavior.php index 5baae4c8..fa35677a 100644 --- a/Model/Behavior/UploadBehavior.php +++ b/Model/Behavior/UploadBehavior.php @@ -1344,7 +1344,7 @@ protected function _resizePhp(Model $model, $field, $path, $size, $geometry, $th $outputHandler = 'imagepng'; $supportsQuality = true; // convert 0 (lowest) - 100 (highest) thumbnailQuality, to 0 (highest) - 9 (lowest) quality (see http://php.net/manual/en/function.imagepng.php) - $adjustedQuality = intval((100 - $this->settings[$model->alias][$field]['thumbnailQuality']) / 100 * 9); + $adjustedQuality = (int)((100 - $this->settings[$model->alias][$field]['thumbnailQuality']) / 100 * 9); break; default: return false; @@ -1508,12 +1508,12 @@ protected function _createImageResource($filename, $pathInfo) { */ protected function _imagecreatefromjpegexif($filename) { $image = imagecreatefromjpeg($filename); - $exif = false; + $exif = array(); if (function_exists('exif_read_data')) { $exif = exif_read_data($filename); } - if ($image && $exif && isset($exif['Orientation'])) { + if ($image && isset($exif['Orientation']) === true) { $ort = $exif['Orientation']; } else { return $image;