Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-15 08:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

static code analysis fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-04-05 20:04:48 +02:00
parent 9a4c4495df
commit f730ca5f99
5 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Admin/Installer.php
View File

@ -16,20 +16,12 @@ namespace Modules\Media\Admin;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Media\Controller\ApiController;
use Modules\Media\Models\Collection; use Modules\Media\Models\Collection;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\MediaType; use Modules\Media\Models\MediaType;
use Modules\Media\Models\MediaTypeL11n;
use Modules\Media\Models\MediaTypeL11nMapper;
use Modules\Media\Models\MediaTypeMapper;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\UploadFile;
use phpOMS\Application\ApplicationAbstract; use phpOMS\Application\ApplicationAbstract;
use phpOMS\Config\SettingsInterface; use phpOMS\Config\SettingsInterface;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
@ -257,7 +249,7 @@ final class Installer extends InstallerAbstract
$request->setData('virtualPath', $request->setData('virtualPath',
(string) ( (string) (
$data['create_collection'] $data['create_collection']
? \rtrim($data['virtualPath'] ?? '/', '/') . '/' . ((string) $data['name'] ?? '') ? \rtrim($data['virtualPath'] ?? '/', '/') . '/' . ((string) ($data['name'] ?? ''))
: ($data['virtualPath'] ?? '/') : ($data['virtualPath'] ?? '/')
) )
); );
@ -267,8 +259,10 @@ final class Installer extends InstallerAbstract
$tempPath = __DIR__ . '/../../../temp/'; $tempPath = __DIR__ . '/../../../temp/';
foreach ($data['files'] as $file) { foreach ($data['files'] as $file) {
if (\is_file(__DIR__ . '/../../..' . $file)) { $filePath = __DIR__ . '/../../..' . $file;
File::copy(__DIR__ . '/../../..' . $file, $tempPath . $file);
if (\is_file($filePath)) {
File::copy($filePath, $tempPath . $file);
$request->addFile([ $request->addFile([
'size' => \filesize($tempPath . $file), 'size' => \filesize($tempPath . $file),
@ -276,8 +270,8 @@ final class Installer extends InstallerAbstract
'tmp_name' => $tempPath . $file, 'tmp_name' => $tempPath . $file,
'error' => \UPLOAD_ERR_OK, 'error' => \UPLOAD_ERR_OK,
]); ]);
} if (\is_dir(__DIR__ . '/../../..' . $file)) { } if (\is_dir($filePath)) {
Directory::copy(__DIR__ . '/../../..' . $file, $tempPath . $file); Directory::copy($filePath, $tempPath . $file);
$iterator = new \RecursiveIteratorIterator( $iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($tempPath . $file . '/', \RecursiveDirectoryIterator::SKIP_DOTS), new \RecursiveDirectoryIterator($tempPath . $file . '/', \RecursiveDirectoryIterator::SKIP_DOTS),
@ -306,9 +300,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->header->account = 1; $request->header->account = 1;
$request->setData('name', (string) $data['name'] ?? ''); $request->setData('name', (string) ($data['name'] ?? ''));
$request->setData('virtualpath', (string) $data['virtualPath'] ?? '/'); $request->setData('virtualpath', (string) ($data['virtualPath'] ?? '/'));
$request->setData('path', (string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) $data['name'] ?? ''))); $request->setData('path', (string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) ($data['name'] ?? ''))));
$module->apiCollectionCreate($request, $response); $module->apiCollectionCreate($request, $response);

4
Controller/ApiController.php
View File

@ -80,8 +80,8 @@ final class ApiController extends Controller
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$uploads = $this->uploadFiles( $uploads = $this->uploadFiles(
names: $request->getDataList('names') ?? [], names: $request->getDataList('names'),
fileNames: $request->getDataList('filenames') ?? [], fileNames: $request->getDataList('filenames'),
files: $request->getFiles(), files: $request->getFiles(),
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')), basePath: __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')),

2
Models/CollectionMapper.php
View File

@ -136,7 +136,7 @@ final class CollectionMapper extends MediaMapper
$localMedia = new Collection(); $localMedia = new Collection();
$localMedia->name = $pathinfo['filename']; $localMedia->name = $pathinfo['filename'];
$localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? ''; $localMedia->extension = $pathinfo['extension'] ?? '';
$localMedia->setVirtualPath($virtualPath); $localMedia->setVirtualPath($virtualPath);
$localMedia->createdBy = new Account(); $localMedia->createdBy = new Account();

2
Models/MediaMapper.php
View File

@ -73,7 +73,7 @@ class MediaMapper extends DataMapperFactory
/** /**
* Belongs to. * Belongs to.
* *
* @var array<string, array{mapper:string, external:string}> * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
* @since 1.0.0 * @since 1.0.0
*/ */
public const OWNS_ONE = [ public const OWNS_ONE = [

2
composer.json
View File

@ -12,7 +12,7 @@
"friendsofphp/php-cs-fixer": ">=3.2", "friendsofphp/php-cs-fixer": ">=3.2",
"squizlabs/php_codesniffer": ">=3.6", "squizlabs/php_codesniffer": ">=3.6",
"phpmd/phpmd": ">=2.9", "phpmd/phpmd": ">=2.9",
"phpstan/phpstan": ">=0.12.58", "phpstan/phpstan": ">=1.5.4",
"phan/phan": ">=3.2.6" "phan/phan": ">=3.2.6"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",