From d2b894f4a77f54a57c8f9480364174e05c14b610 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 17 Aug 2019 14:14:51 +0200 Subject: [PATCH] fix after change to php 7.4 --- Models/Collection.php | 4 ++-- Models/Media.php | 20 ++++++++++---------- Models/UploadFile.php | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Models/Collection.php b/Models/Collection.php index 78dbebb..f8ceb19 100644 --- a/Models/Collection.php +++ b/Models/Collection.php @@ -39,7 +39,7 @@ class Collection extends Media implements \Iterator * @var string * @since 1.0.0 */ - protected $extension = 'collection'; + protected string $extension = 'collection'; /** * Versioned. @@ -47,7 +47,7 @@ class Collection extends Media implements \Iterator * @var bool * @since 1.0.0 */ - protected $versioned = false; + protected bool $versioned = false; /** * Set sources. diff --git a/Models/Media.php b/Models/Media.php index 7792d8c..93a6548 100644 --- a/Models/Media.php +++ b/Models/Media.php @@ -31,7 +31,7 @@ class Media implements \JsonSerializable * @var int * @since 1.0.0 */ - protected $id = 0; + protected int $id = 0; /** * Name. @@ -39,7 +39,7 @@ class Media implements \JsonSerializable * @var string * @since 1.0.0 */ - protected $name = ''; + protected string $name = ''; /** * Extension. @@ -47,7 +47,7 @@ class Media implements \JsonSerializable * @var string * @since 1.0.0 */ - protected $extension = ''; + protected string $extension = ''; /** * File size in bytes. @@ -55,7 +55,7 @@ class Media implements \JsonSerializable * @var int * @since 1.0.0 */ - protected $size = 0; + protected int $size = 0; /** * Author. @@ -71,7 +71,7 @@ class Media implements \JsonSerializable * @var null|\DateTime * @since 1.0.0 */ - protected $createdAt = null; + protected ?\DateTime $createdAt = null; /** * Resource path. @@ -79,7 +79,7 @@ class Media implements \JsonSerializable * @var string * @since 1.0.0 */ - protected $path = ''; + protected string $path = ''; /** * Virtual path. @@ -87,7 +87,7 @@ class Media implements \JsonSerializable * @var string * @since 1.0.0 */ - protected $virtualPath = '/'; + protected string $virtualPath = '/'; /** * Is path absolute? @@ -95,7 +95,7 @@ class Media implements \JsonSerializable * @var bool * @since 1.0.0 */ - protected $isAbsolute = false; + protected bool $isAbsolute = false; /** * Is versioned. @@ -103,7 +103,7 @@ class Media implements \JsonSerializable * @var bool * @since 1.0.0 */ - protected $versioned = false; + protected bool $versioned = false; /** * Media Description. @@ -111,7 +111,7 @@ class Media implements \JsonSerializable * @var string * @since 1.0.0 */ - protected $description = ''; + protected string $description = ''; protected $descriptionRaw = ''; /** diff --git a/Models/UploadFile.php b/Models/UploadFile.php index e855394..fb2d18f 100644 --- a/Models/UploadFile.php +++ b/Models/UploadFile.php @@ -42,7 +42,7 @@ class UploadFile * @var bool * @since 1.0.0 */ - private $isInterlaced = true; + private bool $isInterlaced = true; /** * Upload max size. @@ -50,7 +50,7 @@ class UploadFile * @var int * @since 1.0.0 */ - private $maxSize = 50000000; + private int $maxSize = 50000000; /** * Allowed mime types. @@ -66,7 +66,7 @@ class UploadFile * @var string * @since 1.0.0 */ - private $outputDir = __DIR__ . '/../../Modules/Media/Files'; + private string $outputDir = __DIR__ . '/../../Modules/Media/Files'; /** * Output file name. @@ -74,7 +74,7 @@ class UploadFile * @var string * @since 1.0.0 */ - private $fileName = ''; + private string $fileName = ''; /** * Output file name. @@ -82,7 +82,7 @@ class UploadFile * @var bool * @since 1.0.0 */ - private $preserveFileName = true; + private bool $preserveFileName = true; /** * Upload file to server.