From 03a598ba46aa3a0c5657ee188603fb2329eedcfc Mon Sep 17 00:00:00 2001
From: Gennady Zolotukhin <g.a.zolotukhin@gmail.com>
Date: Wed, 5 Apr 2023 09:44:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D1=8F?=
=?UTF-8?q?=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B5=20?=
=?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BD=D0=B0=20=D0=B4=D0=B8?=
=?UTF-8?q?=D1=81=D0=BA=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D1=81?=
=?UTF-8?q?=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20?=
=?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB?=
=?UTF-8?q?=D0=B0=20=D0=B2=20=D0=B1=D0=B0=D0=B7=D1=83=20=D0=B4=D0=B0=D0=BD?=
=?UTF-8?q?=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
behaviors/FileBehavior.php | 10 +++++-----
behaviors/FileSingleBehavior.php | 21 +++++++++++----------
models/File.php | 10 +++++-----
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/behaviors/FileBehavior.php b/behaviors/FileBehavior.php
index 38ac8c7..ae2ed3b 100644
--- a/behaviors/FileBehavior.php
+++ b/behaviors/FileBehavior.php
@@ -83,8 +83,9 @@ class FileBehavior extends RelationBehavior
$file->object_id = $model->id;
$file->type = File::TYPE_FILE_FILE;
$file->status = File::STATUS_ENABLED;
- $file->save(false);
- $file->saveFile($instance);
+ if ($file->saveFile($instance)) {
+ $file->save(false);
+ }
return $file->id;
}
@@ -114,10 +115,9 @@ class FileBehavior extends RelationBehavior
$file->object_id = $model->id;
$file->status = File::STATUS_ENABLED;
$file->type = File::TYPE_FILE_IMAGE;
- $file->save(false);
- if ($instance) {
- $file->saveFile($instance);
+ if ($instance && $file->saveFile($instance)) {
+ $file->save(false);
}
return $file;
diff --git a/behaviors/FileSingleBehavior.php b/behaviors/FileSingleBehavior.php
index bec368d..6dd6dd3 100644
--- a/behaviors/FileSingleBehavior.php
+++ b/behaviors/FileSingleBehavior.php
@@ -61,22 +61,22 @@ class FileSingleBehavior extends Behavior
*/
public function saveSingleImage()
{
- if ($this->owner) {
+ if ($this->owner) {
$imageUpload = UploadedFile::getInstance($this->owner, $this->formAttribute);
if (!$imageUpload && UrlHelper::isUrl($this->owner->{$this->formAttribute})) {
- $imageUpload = $this->owner->{$this->formAttribute};
+ $imageUpload = $this->owner->{$this->formAttribute};
}
if ($imageUpload) {
- $imageId = $this->addImage($imageUpload);
+ $imageId = $this->addImage($imageUpload);
- $model = $this->owner;
- $model->{$this->attribute} = $imageId;
- $this->detach();
- $model->save(false);
+ $model = $this->owner;
+ $model->{$this->attribute} = $imageId;
+ $this->detach();
+ $model->save(false);
}
- }
+ }
}
/**
@@ -100,8 +100,9 @@ class FileSingleBehavior extends Behavior
$file->object_id = $model->id;
$file->type = File::TYPE_FILE_FILE;
$file->status = File::STATUS_ENABLED;
- $file->save(false);
- $file->saveFile($instance);
+ if ($file->saveFile($instance)) {
+ $file->save(false);
+ }
return $file->id;
}
diff --git a/models/File.php b/models/File.php
index 4a367c1..afc5114 100644
--- a/models/File.php
+++ b/models/File.php
@@ -62,9 +62,9 @@ class File extends ActiveRecord
/**
- * @inheritdoc
+ * @return string
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'media_file';
}
@@ -297,7 +297,7 @@ class File extends ActiveRecord
*
* @param string|false|UploadedFile $instance
*
- * @return bool|null|string
+ * @return bool|null
*/
public function saveFile($instance = false)
{
@@ -313,8 +313,8 @@ class File extends ActiveRecord
if ($file) {
$file->saveAs($pathOriginalFile, false);
}
- } elseif ($instance && UrlHelper::isUrl($instance)) {
- FileHelper::saveFileFromInternet($instance, $pathOriginal, $pathOriginalFile);
+/* } elseif ($instance && UrlHelper::isUrl($instance)) {
+ FileHelper::saveFileFromInternet($instance, $pathOriginal, $pathOriginalFile);*/
} elseif ($instance && is_file($instance)) {
copy($instance, $pathOriginalFile);
} else {
--
GitLab