Upgrade to 3.2.0

This commit is contained in:
Bastian Allgeier
2019-06-25 09:56:08 +02:00
parent 9e18cf635d
commit 9c89153d35
296 changed files with 14408 additions and 2504 deletions

View File

@@ -18,9 +18,9 @@ use Kirby\Toolkit\V;
*
* @package Kirby Image
* @author Bastian Allgeier <bastian@getkirby.com>
* @link http://getkirby.com
* @copyright Bastian Allgeier
* @license MIT
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @license https://opensource.org/licenses/MIT
*/
class Image extends File
{
@@ -54,7 +54,7 @@ class Image extends File
}
/**
* Improved var_dump() output
* Improved `var_dump` output
*
* @return array
*/
@@ -80,15 +80,15 @@ class Image extends File
/**
* Returns the dimensions of the file if possible
*
* @return Dimensions
* @return Kirby\Image\Dimensions
*/
public function dimensions(): Dimensions
public function dimensions()
{
if ($this->dimensions !== null) {
return $this->dimensions;
}
if (in_array($this->mime(), ['image/jpeg', 'image/png', 'image/gif'])) {
if (in_array($this->mime(), ['image/jpeg', 'image/jp2', 'image/png', 'image/gif'])) {
return $this->dimensions = Dimensions::forImage($this->root);
}
@@ -114,9 +114,9 @@ class Image extends File
/**
* Returns the exif object for this file (if image)
*
* @return Exif
* @return Kirby\Image\Exif
*/
public function exif(): Exif
public function exif()
{
if ($this->exif !== null) {
return $this->exif;
@@ -129,7 +129,7 @@ class Image extends File
* Sends an appropriate header for the asset
*
* @param boolean $send
* @return Response|string
* @return Kirby\Http\Response|string
*/
public function header(bool $send = true)
{