From f730ca5f99e245b80cea538860455ec54582dfea Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 5 Apr 2022 20:04:48 +0200 Subject: [PATCH] static code analysis fixes --- Admin/Installer.php | 26 ++++++++++---------------- Controller/ApiController.php | 4 ++-- Models/CollectionMapper.php | 2 +- Models/MediaMapper.php | 2 +- composer.json | 2 +- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 99d6c4e..0ce5a85 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -16,20 +16,12 @@ namespace Modules\Media\Admin; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\NullAccount; -use Modules\Media\Controller\ApiController; use Modules\Media\Models\Collection; use Modules\Media\Models\CollectionMapper; -use Modules\Media\Models\Media; -use Modules\Media\Models\MediaMapper; 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\UploadFile; use phpOMS\Application\ApplicationAbstract; use phpOMS\Config\SettingsInterface; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Module\InstallerAbstract; @@ -257,7 +249,7 @@ final class Installer extends InstallerAbstract $request->setData('virtualPath', (string) ( $data['create_collection'] - ? \rtrim($data['virtualPath'] ?? '/', '/') . '/' . ((string) $data['name'] ?? '') + ? \rtrim($data['virtualPath'] ?? '/', '/') . '/' . ((string) ($data['name'] ?? '')) : ($data['virtualPath'] ?? '/') ) ); @@ -267,8 +259,10 @@ final class Installer extends InstallerAbstract $tempPath = __DIR__ . '/../../../temp/'; foreach ($data['files'] as $file) { - if (\is_file(__DIR__ . '/../../..' . $file)) { - File::copy(__DIR__ . '/../../..' . $file, $tempPath . $file); + $filePath = __DIR__ . '/../../..' . $file; + + if (\is_file($filePath)) { + File::copy($filePath, $tempPath . $file); $request->addFile([ 'size' => \filesize($tempPath . $file), @@ -276,8 +270,8 @@ final class Installer extends InstallerAbstract 'tmp_name' => $tempPath . $file, 'error' => \UPLOAD_ERR_OK, ]); - } if (\is_dir(__DIR__ . '/../../..' . $file)) { - Directory::copy(__DIR__ . '/../../..' . $file, $tempPath . $file); + } if (\is_dir($filePath)) { + Directory::copy($filePath, $tempPath . $file); $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($tempPath . $file . '/', \RecursiveDirectoryIterator::SKIP_DOTS), @@ -306,9 +300,9 @@ final class Installer extends InstallerAbstract $request = new HttpRequest(new HttpUri('')); $request->header->account = 1; - $request->setData('name', (string) $data['name'] ?? ''); - $request->setData('virtualpath', (string) $data['virtualPath'] ?? '/'); - $request->setData('path', (string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) $data['name'] ?? ''))); + $request->setData('name', (string) ($data['name'] ?? '')); + $request->setData('virtualpath', (string) ($data['virtualPath'] ?? '/')); + $request->setData('path', (string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) ($data['name'] ?? '')))); $module->apiCollectionCreate($request, $response); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 4104f87..0dc7d26 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -80,8 +80,8 @@ final class ApiController extends Controller public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { $uploads = $this->uploadFiles( - names: $request->getDataList('names') ?? [], - fileNames: $request->getDataList('filenames') ?? [], + names: $request->getDataList('names'), + fileNames: $request->getDataList('filenames'), files: $request->getFiles(), account: $request->header->account, basePath: __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')), diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php index b7444c3..192b3ba 100755 --- a/Models/CollectionMapper.php +++ b/Models/CollectionMapper.php @@ -136,7 +136,7 @@ final class CollectionMapper extends MediaMapper $localMedia = new Collection(); $localMedia->name = $pathinfo['filename']; - $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? ''; + $localMedia->extension = $pathinfo['extension'] ?? ''; $localMedia->setVirtualPath($virtualPath); $localMedia->createdBy = new Account(); diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index d4e16a7..dcd8f0d 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -73,7 +73,7 @@ class MediaMapper extends DataMapperFactory /** * Belongs to. * - * @var array + * @var array * @since 1.0.0 */ public const OWNS_ONE = [ diff --git a/composer.json b/composer.json index b90cb5e..10044a1 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "friendsofphp/php-cs-fixer": ">=3.2", "squizlabs/php_codesniffer": ">=3.6", "phpmd/phpmd": ">=2.9", - "phpstan/phpstan": ">=0.12.58", + "phpstan/phpstan": ">=1.5.4", "phan/phan": ">=3.2.6" }, "minimum-stability": "dev",