Upgrade to 3.2.5

This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions

View File

@@ -7,7 +7,6 @@ use Kirby\Http\Response;
use Kirby\Toolkit\File;
use Kirby\Toolkit\Html;
use Kirby\Toolkit\Mime;
use Kirby\Toolkit\Str;
use Kirby\Toolkit\V;
/**
@@ -21,10 +20,9 @@ use Kirby\Toolkit\V;
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @license https://opensource.org/licenses/MIT
*/
*/
class Image extends File
{
/**
* optional url where the file is reachable
* @var string
@@ -58,7 +56,7 @@ class Image extends File
*
* @return array
*/
public function __debuginfo(): array
public function __debugInfo(): array
{
return array_merge($this->toArray(), [
'dimensions' => $this->dimensions(),
@@ -80,7 +78,7 @@ class Image extends File
/**
* Returns the dimensions of the file if possible
*
* @return Kirby\Image\Dimensions
* @return \Kirby\Image\Dimensions
*/
public function dimensions()
{
@@ -114,7 +112,7 @@ class Image extends File
/**
* Returns the exif object for this file (if image)
*
* @return Kirby\Image\Exif
* @return \Kirby\Image\Exif
*/
public function exif()
{
@@ -129,7 +127,7 @@ class Image extends File
* Sends an appropriate header for the asset
*
* @param boolean $send
* @return Kirby\Http\Response|string
* @return \Kirby\Http\Response|string
*/
public function header(bool $send = true)
{
@@ -200,6 +198,7 @@ class Image extends File
/**
* Runs a set of validations on the image object
*
* @param array $rules
* @return bool
*/
public function match(array $rules): bool