Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-17 01:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some getter/setter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:20 +01:00
parent 33ceb89e65
commit 249e2f65ad
24 changed files with 292 additions and 542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Installer.php
View File

@ -84,10 +84,10 @@ final class Installer extends InstallerAbstract
private static function installMedia($dbPool, $data) : void private static function installMedia($dbPool, $data) : void
{ {
$collection = new Collection(); $collection = new Collection();
$collection->setName((string) $data['name'] ?? ''); $collection->name = (string) $data['name'] ?? '';
$collection->setVirtualPath((string) $data['virtualPath'] ?? '/'); $collection->setVirtualPath((string) $data['virtualPath'] ?? '/');
$collection->setPath((string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) $data['name'] ?? ''))); $collection->setPath((string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) $data['name'] ?? '')));
$collection->setCreatedBy(new NullAccount((int) $data['user'] ?? 1)); $collection->createdBy = new NullAccount((int) $data['user'] ?? 1);
CollectionMapper::create($collection); CollectionMapper::create($collection);
} }

53
Controller/ApiController.php
View File

@ -34,6 +34,7 @@ use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\System\File\FileUtils;
/** /**
* Media class. * Media class.
@ -88,7 +89,7 @@ final class ApiController extends Controller
$uploads = $this->uploadFiles( $uploads = $this->uploadFiles(
$request->getData('name') === null || $request->getFiles() !== null ? '' : $request->getData('name'), $request->getData('name') === null || $request->getFiles() !== null ? '' : $request->getData('name'),
$request->getFiles(), $request->getFiles(),
$request->getHeader()->getAccount(), $request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')), __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')),
\urldecode((string) ($request->getData('virtualpath') ?? '')), \urldecode((string) ($request->getData('virtualpath') ?? '')),
(string) ($request->getData('type') ?? ''), (string) ($request->getData('type') ?? ''),
@ -240,12 +241,12 @@ final class ApiController extends Controller
$media = new Media(); $media = new Media();
$media->setPath(self::normalizeDbPath($status['path']) . '/' . $status['filename']); $media->setPath(self::normalizeDbPath($status['path']) . '/' . $status['filename']);
$media->setName($status['name']); $media->name = $status['name'];
$media->setSize($status['size']); $media->size = $status['size'];
$media->setCreatedBy(new NullAccount($account)); $media->createdBy = new NullAccount($account);
$media->setExtension($status['extension']); $media->extension = $status['extension'];
$media->setVirtualPath($virtualPath); $media->setVirtualPath($virtualPath);
$media->setType($type); $media->type = $type;
MediaMapper::create($media); MediaMapper::create($media);
@ -296,7 +297,7 @@ final class ApiController extends Controller
/** @var Media $new */ /** @var Media $new */
$new = $this->updateMediaFromRequest($request); $new = $this->updateMediaFromRequest($request);
$this->updateModel($request->getHeader()->getAccount(), $old, $new, MediaMapper::class, 'media', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, MediaMapper::class, 'media', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media successfully updated', $new); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media successfully updated', $new);
} }
@ -315,8 +316,8 @@ final class ApiController extends Controller
/** @var Media $media */ /** @var Media $media */
$media = MediaMapper::get($id); $media = MediaMapper::get($id);
$media->setName((string) ($request->getData('name') ?? $media->getName())); $media->name = (string) ($request->getData('name') ?? $media->name);
$media->setDescription((string) ($request->getData('description') ?? $media->getDescription())); $media->description = (string) ($request->getData('description') ?? $media->description);
$media->setPath((string) ($request->getData('path') ?? $media->getPath())); $media->setPath((string) ($request->getData('path') ?? $media->getPath()));
$media->setVirtualPath(\urldecode((string) ($request->getData('virtualpath') ?? $media->getVirtualPath()))); $media->setVirtualPath(\urldecode((string) ($request->getData('virtualpath') ?? $media->getVirtualPath())));
@ -327,20 +328,20 @@ final class ApiController extends Controller
) { ) {
$name = \explode('.', \basename($path)); $name = \explode('.', \basename($path));
$media->setName($name[0]); $media->name = $name[0];
$media->setExtension($name[1] ?? ''); $media->extension = $name[1] ?? '';
$media->setVirtualPath(\dirname($path)); $media->setVirtualPath(\dirname($path));
$media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/')); $media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
$media->setAbsolute(false); $media->isAbsolute = false;
} }
if ($request->getData('content') !== null) { if ($request->getData('content') !== null) {
\file_put_contents( \file_put_contents(
$media->isAbsolute() ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'), $media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'),
$request->getData('content') $request->getData('content')
); );
$media->setSize(\strlen($request->getData('content'))); $media->size = \strlen($request->getData('content'));
} }
return $media; return $media;
@ -363,13 +364,13 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateCollectionCreate($request))) { if (!empty($val = $this->validateCollectionCreate($request))) {
$response->set('collection_create', new FormValidation($val)); $response->set('collection_create', new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400); $response->header->status = RequestStatusCode::R_400;
return; return;
} }
$collection = $this->createCollectionFromRequest($request); $collection = $this->createCollectionFromRequest($request);
$this->createModel($request->getHeader()->getAccount(), $collection, CollectionMapper::class, 'collection', $request->getOrigin()); $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Collection', 'Collection successfully created.', $collection); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Collection', 'Collection successfully created.', $collection);
} }
@ -404,10 +405,10 @@ final class ApiController extends Controller
private function createCollectionFromRequest(RequestAbstract $request) : Collection private function createCollectionFromRequest(RequestAbstract $request) : Collection
{ {
$mediaCollection = new Collection(); $mediaCollection = new Collection();
$mediaCollection->setName($request->getData('name') ?? ''); $mediaCollection->name = $request->getData('name') ?? '';
$mediaCollection->setDescription($description = Markdown::parse($request->getData('description') ?? '')); $mediaCollection->description = ($description = Markdown::parse($request->getData('description') ?? ''));
$mediaCollection->setDescriptionRaw($description); $mediaCollection->descriptionRaw = $description;
$mediaCollection->setCreatedBy(new NullAccount($request->getHeader()->getAccount())); $mediaCollection->createdBy = new NullAccount($request->header->account);
$media = $request->getDataJson('media-list'); $media = $request->getDataJson('media-list');
foreach ($media as $file) { foreach ($media as $file) {
@ -459,10 +460,10 @@ final class ApiController extends Controller
/* Create collection */ /* Create collection */
$mediaCollection = new Collection(); $mediaCollection = new Collection();
$mediaCollection->setName($name); $mediaCollection->name = $name;
$mediaCollection->setDescription(Markdown::parse($description)); $mediaCollection->description = Markdown::parse($description);
$mediaCollection->setDescriptionRaw($description); $mediaCollection->descriptionRaw = $description;
$mediaCollection->setCreatedBy(new NullAccount($account)); $mediaCollection->createdBy = new NullAccount($account);
$mediaCollection->setSources($media); $mediaCollection->setSources($media);
$mediaCollection->setVirtualPath('/'); $mediaCollection->setVirtualPath('/');
$mediaCollection->setPath('/Modules/Media/Files'); $mediaCollection->setPath('/Modules/Media/Files');
@ -496,7 +497,7 @@ final class ApiController extends Controller
} else { } else {
if (\stripos( if (\stripos(
FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/' . \ltrim($path, '\\/')), FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/' . \ltrim($path, '\\/')),
FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/') FileUtils::absolute(__DIR__ . '/../../../')
) !== 0 ) !== 0
) { ) {
$outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files'); $outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files');
@ -527,7 +528,7 @@ final class ApiController extends Controller
], ],
]; ];
$created = $this->createDbEntries($status, $request->getHeader()->getAccount(), $virtualPath, $request->getData('type') ?? ''); $created = $this->createDbEntries($status, $request->header->account, $virtualPath, $request->getData('type') ?? '');
$ids = []; $ids = [];
foreach ($created as $file) { foreach ($created as $file) {

38
Controller/BackendController.php
View File

@ -115,28 +115,28 @@ final class BackendController extends Controller
if (\is_array($collection) && \is_dir(__DIR__ . '/../Files' . $path)) { if (\is_array($collection) && \is_dir(__DIR__ . '/../Files' . $path)) {
$collection = new Collection(); $collection = new Collection();
$collection->setName(\basename($path)); $collection->name = \basename($path);
$collection->setVirtualPath(\dirname($path)); $collection->setVirtualPath(\dirname($path));
$collection->setPath(\dirname($path)); $collection->setPath(\dirname($path));
$collection->setAbsolute(false); $collection->isAbsolute = false;
} }
if ($collection instanceof Collection) { if ($collection instanceof Collection) {
$media += $collection->getSources(); $media += $collection->getSources();
/** @var string[] $glob */ /** @var string[] $glob */
$glob = $collection->isAbsolute() $glob = $collection->isAbsolute
? $collection->getPath() . '/' . $collection->getName() . '/*' ? $collection->getPath() . '/' . $collection->name . '/*'
: \glob(__DIR__ . '/../Files/' . \rtrim($collection->getPath(), '/') . '/' . $collection->getName() . '/*'); : \glob(__DIR__ . '/../Files/' . \rtrim($collection->getPath(), '/') . '/' . $collection->name . '/*');
$glob = $glob === false ? [] : $glob; $glob = $glob === false ? [] : $glob;
foreach ($glob as $file) { foreach ($glob as $file) {
foreach ($media as $obj) { foreach ($media as $obj) {
if (($obj->getExtension() !== 'collection' if (($obj->extension !== 'collection'
&& !empty($obj->getExtension()) && !empty($obj->extension)
&& $obj->getName() . '.' . $obj->getExtension() === \basename($file)) && $obj->name . '.' . $obj->extension === \basename($file))
|| ($obj->getExtension() === 'collection' || ($obj->extension === 'collection'
&& $obj->getName() === \basename($file)) && $obj->name === \basename($file))
) { ) {
continue 2; continue 2;
} }
@ -145,10 +145,10 @@ final class BackendController extends Controller
$pathinfo = \pathinfo($file); $pathinfo = \pathinfo($file);
$localMedia = new Media(); $localMedia = new Media();
$localMedia->setName($pathinfo['filename']); $localMedia->name = $pathinfo['filename'];
$localMedia->setExtension(\is_dir($file) ? 'collection' : $pathinfo['extension'] ?? ''); $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '';
$localMedia->setVirtualPath($path); $localMedia->setVirtualPath($path);
$localMedia->setCreatedBy(new Account()); $localMedia->createdBy = new Account();
$media[] = $localMedia; $media[] = $localMedia;
} }
@ -180,15 +180,15 @@ final class BackendController extends Controller
$id = (int) $request->getData('id'); $id = (int) $request->getData('id');
$media = MediaMapper::get($id); $media = MediaMapper::get($id);
if ($media->getExtension() === 'collection') { if ($media->extension === 'collection') {
$media = MediaMapper::getByVirtualPath( $media = MediaMapper::getByVirtualPath(
$media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->getName() $media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->name
); );
$collection = CollectionMapper::get((int) $request->getData('id')); $collection = CollectionMapper::get((int) $request->getData('id'));
$media = \array_merge($media, $collection->getSources()); $media = \array_merge($media, $collection->getSources());
$view->addData('path', $collection->getVirtualPath() . '/' . $collection->getName()); $view->addData('path', $collection->getVirtualPath() . '/' . $collection->name);
$view->setTemplate('/Modules/Media/Theme/Backend/media-list'); $view->setTemplate('/Modules/Media/Theme/Backend/media-list');
} }
@ -200,11 +200,11 @@ final class BackendController extends Controller
) { ) {
$name = \explode('.', \basename($path)); $name = \explode('.', \basename($path));
$media->setName($name[0]); $media->name = $name[0];
$media->setExtension($name[1] ?? ''); $media->extension = $name[1] ?? '';
$media->setVirtualPath(\dirname($path)); $media->setVirtualPath(\dirname($path));
$media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/')); $media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
$media->setAbsolute(false); $media->isAbsolute = false;
} }
} }

13
Models/Collection.php
View File

@ -38,7 +38,7 @@ class Collection extends Media implements \Iterator
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $extension = 'collection'; public string $extension = 'collection';
/** /**
* Is collection. * Is collection.
@ -48,17 +48,6 @@ class Collection extends Media implements \Iterator
*/ */
protected int $collection = 1; protected int $collection = 1;
/**
* Constructor.
*
* @since 1.0.0
*/
public function __construct()
{
parent::__construct();
$this->setExtension('colection');
}
/** /**
* Set sources. * Set sources.
* *

26
Models/CollectionMapper.php
View File

@ -129,19 +129,19 @@ final class CollectionMapper extends MediaMapper
$parent = CollectionMapper::getParentCollection($path); $parent = CollectionMapper::getParentCollection($path);
if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) { if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) {
$parent = new Collection(); $parent = new Collection();
$parent->setName(\basename($path)); $parent->name = \basename($path);
$parent->setVirtualPath(\dirname($path)); $parent->setVirtualPath(\dirname($path));
$parent->setPath(\dirname($path)); $parent->setPath(\dirname($path));
$parent->setAbsolute(false); $parent->isAbsolute = false;
} }
if ($parent instanceof Collection) { if ($parent instanceof Collection) {
$collection += $parent->getSources(); $collection += $parent->getSources();
/** @var string[] $glob */ /** @var string[] $glob */
$glob = $parent->isAbsolute() $glob = $parent->isAbsolute
? $parent->getPath() . '/' . $parent->getName() . '/*' ? $parent->getPath() . '/' . $parent->name . '/*'
: \glob(__DIR__ . '/../Files/' . \rtrim($parent->getPath(), '/') . '/' . $parent->getName() . '/*'); : \glob(__DIR__ . '/../Files/' . \rtrim($parent->getPath(), '/') . '/' . $parent->name . '/*');
$glob = $glob === false ? [] : $glob; $glob = $glob === false ? [] : $glob;
foreach ($glob as $file) { foreach ($glob as $file) {
@ -150,11 +150,11 @@ final class CollectionMapper extends MediaMapper
} }
foreach ($collection as $obj) { foreach ($collection as $obj) {
if (($obj->getExtension() !== 'collection' if (($obj->extension !== 'collection'
&& !empty($obj->getExtension()) && !empty($obj->extension)
&& $obj->getName() . '.' . $obj->getExtension() === \basename($file)) && $obj->name . '.' . $obj->extension === \basename($file))
|| ($obj->getExtension() === 'collection' || ($obj->extension === 'collection'
&& $obj->getName() === \basename($file)) && $obj->name === \basename($file))
) { ) {
continue 2; continue 2;
} }
@ -163,10 +163,10 @@ final class CollectionMapper extends MediaMapper
$pathinfo = \pathinfo($file); $pathinfo = \pathinfo($file);
$localMedia = new Collection(); $localMedia = new Collection();
$localMedia->setName($pathinfo['filename']); $localMedia->name = $pathinfo['filename'];
$localMedia->setExtension(\is_dir($file) ? 'collection' : $pathinfo['extension'] ?? ''); $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '';
$localMedia->setVirtualPath($path); $localMedia->setVirtualPath($path);
$localMedia->setCreatedBy(new Account()); $localMedia->createdBy = new Account();
$collection[] = $localMedia; $collection[] = $localMedia;
} }

252
Models/Media.php
View File

@ -41,7 +41,7 @@ class Media implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $name = ''; public string $name = '';
/** /**
* Type. * Type.
@ -49,7 +49,7 @@ class Media implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $type = ''; public string $type = '';
/** /**
* Extension. * Extension.
@ -57,7 +57,7 @@ class Media implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $extension = ''; public string $extension = '';
/** /**
* File size in bytes. * File size in bytes.
@ -65,7 +65,7 @@ class Media implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $size = 0; public int $size = 0;
/** /**
* Author. * Author.
@ -73,7 +73,7 @@ class Media implements \JsonSerializable
* @var Account * @var Account
* @since 1.0.0 * @since 1.0.0
*/ */
protected Account $createdBy; public Account $createdBy;
/** /**
* Uploaded. * Uploaded.
@ -81,7 +81,7 @@ class Media implements \JsonSerializable
* @var \DateTimeImmutable * @var \DateTimeImmutable
* @since 1.0.0 * @since 1.0.0
*/ */
protected \DateTimeImmutable $createdAt; public \DateTimeImmutable $createdAt;
/** /**
* Resource path. * Resource path.
@ -105,7 +105,7 @@ class Media implements \JsonSerializable
* @var bool * @var bool
* @since 1.0.0 * @since 1.0.0
*/ */
protected bool $isAbsolute = false; public bool $isAbsolute = false;
/** /**
* Is versioned. * Is versioned.
@ -113,7 +113,7 @@ class Media implements \JsonSerializable
* @var bool * @var bool
* @since 1.0.0 * @since 1.0.0
*/ */
protected bool $versioned = false; public bool $isVersioned = false;
/** /**
* Media Description. * Media Description.
@ -121,7 +121,7 @@ class Media implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $description = ''; public string $description = '';
/** /**
* Media Description. * Media Description.
@ -129,7 +129,7 @@ class Media implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $descriptionRaw = ''; public string $descriptionRaw = '';
/** /**
* Media encryption nonce. * Media encryption nonce.
@ -153,7 +153,7 @@ class Media implements \JsonSerializable
* @var bool * @var bool
* @since 1.0.0 * @since 1.0.0
*/ */
protected bool $hidden = false; public bool $isHidden = false;
/** /**
* Is collection. * Is collection.
@ -298,56 +298,6 @@ class Media implements \JsonSerializable
return $this->nonce === null ? false : \hash_equals($this->nonce, $nonce); return $this->nonce === null ? false : \hash_equals($this->nonce, $nonce);
} }
/**
* @return bool
*
* @since 1.0.0
*/
public function isAbsolute() : bool
{
return $this->isAbsolute;
}
/**
* @return void
*
* @since 1.0.0
*/
public function setAbsolute(bool $absolute) : void
{
$this->isAbsolute = $absolute;
}
/**
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
/**
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getExtension() : string
{
return $this->extension;
}
/** /**
* @return string * @return string
* *
@ -368,90 +318,6 @@ class Media implements \JsonSerializable
return $this->virtualPath; return $this->virtualPath;
} }
/**
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getType() : string
{
return $this->type;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getDescriptionRaw() : string
{
return $this->descriptionRaw;
}
/**
* @return int
*
* @since 1.0.0
*/
public function getSize() : int
{
return $this->size;
}
/**
* @return bool
*
* @since 1.0.0
*/
public function isVersioned() : bool
{
return $this->versioned;
}
/**
* @param Account $createdBy Creator
*
* @return void
*
* @since 1.0.0
*/
public function setCreatedBy(Account $createdBy) : void
{
$this->createdBy = $createdBy;
}
/**
* @param string $extension Extension
*
* @return void
*
* @since 1.0.0
*/
public function setExtension(string $extension) : void
{
$this->extension = $extension;
}
/** /**
* @param string $path $filepath * @param string $path $filepath
* *
@ -476,100 +342,6 @@ class Media implements \JsonSerializable
$this->virtualPath = \str_replace('\\', '/', $path); $this->virtualPath = \str_replace('\\', '/', $path);
} }
/**
* @param string $name Media name (not file name)
*
* @return void
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* @param string $type Media type
*
* @return void
*
* @since 1.0.0
*/
public function setType(string $type) : void
{
$this->type = $type;
}
/**
* @param string $description Media description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $description) : void
{
$this->description = $description;
}
/**
* @param string $description Media description
*
* @return void
*
* @since 1.0.0
*/
public function setDescriptionRaw(string $description) : void
{
$this->descriptionRaw = $description;
}
/**
* @param int $size Filesize
*
* @return void
*
* @since 1.0.0
*/
public function setSize(int $size) : void
{
$this->size = $size;
}
/**
* @param bool $versioned File is version controlled
*
* @return void
*
* @since 1.0.0
*/
public function setVersioned(bool $versioned) : void
{
$this->versioned = $versioned;
}
/**
* @return bool
*
* @since 1.0.0
*/
public function isHidden() : bool
{
return $this->hidden;
}
/**
* @param bool $hidden File is hidden
*
* @return void
*
* @since 1.0.0
*/
public function setHidden(bool $hidden) : void
{
$this->hidden = $hidden;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -583,7 +355,7 @@ class Media implements \JsonSerializable
'extension' => $this->extension, 'extension' => $this->extension,
'virtualpath' => $this->virtualPath, 'virtualpath' => $this->virtualPath,
'size' => $this->size, 'size' => $this->size,
'hidden' => $this->hidden, 'hidden' => $this->isHidden,
'path' => $this->path, 'path' => $this->path,
'absolute' => $this->isAbsolute, 'absolute' => $this->isAbsolute,
'createdBy' => $this->createdBy, 'createdBy' => $this->createdBy,

4
Models/MediaMapper.php
View File

@ -40,8 +40,8 @@ class MediaMapper extends DataMapperAbstract
'media_type' => ['name' => 'media_type', 'type' => 'string', 'internal' => 'type'], 'media_type' => ['name' => 'media_type', 'type' => 'string', 'internal' => 'type'],
'media_description' => ['name' => 'media_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], 'media_description' => ['name' => 'media_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true],
'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], 'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'],
'media_versioned' => ['name' => 'media_versioned', 'type' => 'bool', 'internal' => 'versioned'], 'media_versioned' => ['name' => 'media_versioned', 'type' => 'bool', 'internal' => 'isVersioned'],
'media_hidden' => ['name' => 'media_hidden', 'type' => 'bool', 'internal' => 'hidden'], 'media_hidden' => ['name' => 'media_hidden', 'type' => 'bool', 'internal' => 'isHidden'],
'media_file' => ['name' => 'media_file', 'type' => 'string', 'internal' => 'path', 'autocomplete' => true], 'media_file' => ['name' => 'media_file', 'type' => 'string', 'internal' => 'path', 'autocomplete' => true],
'media_virtual' => ['name' => 'media_virtual', 'type' => 'string', 'internal' => 'virtualPath', 'autocomplete' => true], 'media_virtual' => ['name' => 'media_virtual', 'type' => 'string', 'internal' => 'virtualPath', 'autocomplete' => true],
'media_absolute' => ['name' => 'media_absolute', 'type' => 'bool', 'internal' => 'isAbsolute'], 'media_absolute' => ['name' => 'media_absolute', 'type' => 'bool', 'internal' => 'isAbsolute'],

2
Models/UploadFile.php
View File

@ -261,7 +261,7 @@ class UploadFile
$limit = 0; $limit = 0;
do { do {
$sha = \sha1_file($tempName . $rnd); $sha = \sha1($tempName . $rnd);
if ($sha === false) { if ($sha === false) {
throw new \Exception('No file path could be found. Potential attack!'); throw new \Exception('No file path could be found. Potential attack!');

12
Theme/Backend/Components/InlinePreview/BaseView.php
View File

@ -95,18 +95,6 @@ class BaseView extends View
return $this->id; return $this->id;
} }
/**
* Get name
*
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/** /**
* Is required? * Is required?
* *

2
Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
View File

@ -42,7 +42,7 @@
</div> </div>
<div class="box" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true"> <div class="box" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
<template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate"> <template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate">
<span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>"> <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
<span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span> <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
<span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span> <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>

14
Theme/Backend/Components/Media/list.tpl.php
View File

@ -2,7 +2,7 @@
use phpOMS\System\File\FileUtils; use phpOMS\System\File\FileUtils;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
include __DIR__ . '/../template-functions.php'; include __DIR__ . '/../../template-functions.php';
?> ?>
<div class="portlet"> <div class="portlet">
@ -20,16 +20,16 @@ include __DIR__ . '/../template-functions.php';
$url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId());
$icon = ''; $icon = '';
$extensionType = FileUtils::getExtensionType($value->getExtension()); $extensionType = FileUtils::getExtensionType($value->extension);
$icon = $fileIconFunction($extensionType); $icon = $fileIconFunction($extensionType);
?> ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a> <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a> <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
<td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a> <td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->size); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a> <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a> <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
<?php endforeach; ?> <?php endforeach; ?>
<?php if ($count === 0) : ?> <?php if ($count === 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?> <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

4
Theme/Backend/media-collection-create.tpl.php
View File

@ -40,9 +40,9 @@ use phpOMS\Uri\UriFactory;
<div class="portlet-body"> <div class="portlet-body">
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label> <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
<tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled> <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
<tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label> <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
<tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>"> <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
<tr><td><label><?= $this->getHtml('Settings'); ?></label> <tr><td><label><?= $this->getHtml('Settings'); ?></label>
<tr><td> <tr><td>
<label class="checkbox" for="iAddCollection"> <label class="checkbox" for="iAddCollection">

4
Theme/Backend/media-file-create.tpl.php
View File

@ -48,9 +48,9 @@ use phpOMS\Uri\UriFactory;
<div class="portlet-body"> <div class="portlet-body">
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label> <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
<tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled> <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
<tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label> <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
<tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>"> <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
<tr><td><label><?= $this->getHtml('Settings'); ?></label> <tr><td><label><?= $this->getHtml('Settings'); ?></label>
<tr><td> <tr><td>
<label class="checkbox" for="iAddCollection"> <label class="checkbox" for="iAddCollection">

26
Theme/Backend/media-list.tpl.php
View File

@ -87,33 +87,33 @@ $next = empty($media) ? '{/prefix}media/list' : '{/prefix}media/list?{?}&id=
foreach ($media as $key => $value) : foreach ($media as $key => $value) :
++$count; ++$count;
$url = $value->getExtension() === 'collection' $url = $value->extension === 'collection'
? UriFactory::build('{/prefix}media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->getName()) ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name)
: UriFactory::build('{/prefix}media/single?id=' . $value->getId() : UriFactory::build('{/prefix}media/single?id=' . $value->getId()
. '&path={?path}' . ( . '&path={?path}' . (
$value->getId() === 0 $value->getId() === 0
? '/' . $value->getName() . (!empty($value->getExtension()) ? '.' . $value->getExtension() : '') ? '/' . $value->name . (!empty($value->extension) ? '.' . $value->extension : '')
: '' : ''
) )
); );
$icon = $fileIconFunction(FileUtils::getExtensionType($value->getExtension())); $icon = $fileIconFunction(FileUtils::getExtensionType($value->extension));
?> ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a> <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"> <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>">
<?= $this->printHtml( <?= $this->printHtml(
$value->getExtension() !== 'collection' $value->extension !== 'collection'
? $value->getName() . ( ? $value->name . (
$value->getExtension() !== '' ? '.' . $value->getExtension() : '' $value->extension !== '' ? '.' . $value->extension : ''
) : $value->getName()); ?> ) : $value->name); ?>
</a> </a>
<td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a> <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
<td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?php <td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?php
$size = FileSizeType::autoFormat($value->getSize()); $size = FileSizeType::autoFormat($value->size);
echo $this->printHtml($value->getExtension() !== 'collection' ? \number_format($size[0], 1, '.', ','). $size[1] : ''); ?></a> echo $this->printHtml($value->extension !== 'collection' ? \number_format($size[0], 1, '.', ','). $size[1] : ''); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a> <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
<td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a> <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
<?php endforeach; ?> <?php endforeach; ?>
<?php if ($count === 0) : ?> <?php if ($count === 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?> <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

34
Theme/Backend/media-single.tpl.php
View File

@ -39,18 +39,18 @@ echo $this->getData('nav')->render();
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->printHtml($media->getName()); ?></div> <div class="portlet-head"><?= $this->printHtml($media->name); ?></div>
<div class="portlet-body"> <div class="portlet-body">
<table class="list w-100"> <table class="list w-100">
<tbody> <tbody>
<tr><td><?= $this->getHtml('Name'); ?><td class="wf-100"><?= $this->printHtml($media->getName()); ?> <tr><td><?= $this->getHtml('Name'); ?><td class="wf-100"><?= $this->printHtml($media->name); ?>
<tr><td><?= $this->getHtml('Size'); ?><td class="wf-100"><?= $this->printHtml($media->getSize()); ?> <tr><td><?= $this->getHtml('Size'); ?><td class="wf-100"><?= $this->printHtml($media->size); ?>
<tr><td><?= $this->getHtml('Created'); ?><td><?= $this->printHtml($media->getCreatedAt()->format('Y-m-d')); ?> <tr><td><?= $this->getHtml('Created'); ?><td><?= $this->printHtml($media->createdAt->format('Y-m-d')); ?>
<tr><td><?= $this->getHtml('Creator'); ?><td><a href="<?= UriFactory::build('{/prefix}profile/single?for=' . $media->getCreatedBy()->getId()); ?>"><?= $this->printHtml( <tr><td><?= $this->getHtml('Creator'); ?><td><a href="<?= UriFactory::build('{/prefix}profile/single?for=' . $media->createdBy->getId()); ?>"><?= $this->printHtml(
\ltrim($media->getCreatedBy()->getName2() . ', ' . $media->getCreatedBy()->getName1(), ', ') \ltrim($media->createdBy->name2 . ', ' . $media->createdBy->name1, ', ')
); ?></a> ); ?></a>
<tr><td colspan="2"><?= $this->getHtml('Description'); ?> <tr><td colspan="2"><?= $this->getHtml('Description'); ?>
<tr><td colspan="2"><?= $media->getDescription(); ?> <tr><td colspan="2"><?= $media->description; ?>
</table> </table>
</div> </div>
<?php <?php
@ -88,20 +88,20 @@ echo $this->getData('nav')->render();
<td><?= $this->getHtml('Created'); ?> <td><?= $this->getHtml('Created'); ?>
<tbody> <tbody>
<?php <?php
if (!\is_dir($media->isAbsolute() ? $media->getPath() : __DIR__ . '/../../../../' . \ltrim($media->getPath(), '//')) if (!\is_dir($media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../../' . \ltrim($media->getPath(), '//'))
|| $media->getPath() === '' || $media->getPath() === ''
) : ) :
foreach ($media as $key => $value) : foreach ($media as $key => $value) :
$url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId());
$icon = $fileIconFunction(FileUtils::getExtensionType($value->getExtension())); $icon = $fileIconFunction(FileUtils::getExtensionType($value->extension));
?> ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a> <td><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->size); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
<?php endforeach; else : $path = $this->dirPathFunction($media, $this->request->getData('sub') ?? ''); ?> <?php endforeach; else : $path = $this->dirPathFunction($media, $this->request->getData('sub') ?? ''); ?>
<?php $list = \phpOMS\System\File\Local\Directory::list($path); <?php $list = \phpOMS\System\File\Local\Directory::list($path);
foreach ($list as $key => $value) : foreach ($list as $key => $value) :
@ -128,19 +128,19 @@ echo $this->getData('nav')->render();
if ($this->isImageFile($media, $path)) : ?> if ($this->isImageFile($media, $path)) : ?>
<div class="h-overflow centerText"> <div class="h-overflow centerText">
<img style="max-width: 100%" src="<?= $media->getPath(); ?>" alt="<?= $this->printHtml($media->getName()); ?>"> <img style="max-width: 100%" src="<?= $media->getPath(); ?>" alt="<?= $this->printHtml($media->name); ?>">
</div> </div>
<?php elseif ($this->isTextFile($media, $path)) : ?> <?php elseif ($this->isTextFile($media, $path)) : ?>
<!-- if markdown show markdown editor, if image show image editor, if text file show textarea only on edit --> <!-- if markdown show markdown editor, if image show image editor, if text file show textarea only on edit -->
<?php if (!\is_file(($media->isAbsolute() ? '' : __DIR__ . '/../../../../') . $media->getPath())) : ?> <?php if (!\is_file(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath())) : ?>
<div class="centerText"><i class="fa fa-question fa-5x"></i></div> <div class="centerText"><i class="fa fa-question fa-5x"></i></div>
<?php else : ?> <?php else : ?>
<template id="iMediaUpdateTpl"> <template id="iMediaUpdateTpl">
<textarea class="textContent" form="iMediaFileUpdate" data-tpl-text="/media/content" data-tpl-value="/media/content" data-marker="tpl" name="content"></textarea> <textarea class="textContent" form="iMediaFileUpdate" data-tpl-text="/media/content" data-tpl-value="/media/content" data-marker="tpl" name="content"></textarea>
</template> </template>
<pre class="textContent" data-tpl-text="/media/content" data-tpl-value="/media/content"><?= $this->printHtml( <pre class="textContent" data-tpl-text="/media/content" data-tpl-value="/media/content"><?= $this->printHtml(
$this->getFileContent(($media->isAbsolute() ? '' : __DIR__ . '/../../../../') . $media->getPath()) $this->getFileContent(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath())
); ?></pre> ); ?></pre>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>

4
Theme/Backend/media-upload.tpl.php
View File

@ -40,9 +40,9 @@ use phpOMS\Uri\UriFactory;
<div class="portlet-body"> <div class="portlet-body">
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label> <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
<tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled> <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
<tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label> <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
<tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>"> <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
<tr><td><label><?= $this->getHtml('Settings'); ?></label> <tr><td><label><?= $this->getHtml('Settings'); ?></label>
<tr><td> <tr><td>
<label class="checkbox" for="iAddCollection"> <label class="checkbox" for="iAddCollection">

6
Views/MediaView.php
View File

@ -89,7 +89,7 @@ class MediaView extends View
*/ */
protected function isCollectionFunction(Media $media, string $sub = null) : bool protected function isCollectionFunction(Media $media, string $sub = null) : bool
{ {
return ($media->getExtension() === 'collection' return ($media->extension === 'collection'
&& !\is_file($media->getPath() . ($sub ?? ''))) && !\is_file($media->getPath() . ($sub ?? '')))
|| (\is_dir($media->getPath()) || (\is_dir($media->getPath())
&& ($sub === null || \is_dir($media->getPath() . $sub)) && ($sub === null || \is_dir($media->getPath() . $sub))
@ -156,7 +156,7 @@ class MediaView extends View
*/ */
protected function isImageFile(Media $media, string $path = '') : bool protected function isImageFile(Media $media, string $path = '') : bool
{ {
return FileUtils::getExtensionType($media->getExtension()) === ExtensionType::IMAGE return FileUtils::getExtensionType($media->extension) === ExtensionType::IMAGE
|| FileUtils::getExtensionType(File::extension($path)) === ExtensionType::IMAGE; || FileUtils::getExtensionType(File::extension($path)) === ExtensionType::IMAGE;
} }
@ -172,7 +172,7 @@ class MediaView extends View
*/ */
protected function isTextFile(Media $media, string $path = '') : bool protected function isTextFile(Media $media, string $path = '') : bool
{ {
$mediaExtension = FileUtils::getExtensionType($media->getExtension()); $mediaExtension = FileUtils::getExtensionType($media->extension);
$pathExtension = FileUtils::getExtensionType(File::extension($path)); $pathExtension = FileUtils::getExtensionType(File::extension($path));
return $mediaExtension === ExtensionType::TEXT || $pathExtension === ExtensionType::TEXT return $mediaExtension === ExtensionType::TEXT || $pathExtension === ExtensionType::TEXT

26
tests/Controller/Api/ApiControllerCollectionTrait.php
View File

@ -36,7 +36,7 @@ trait ApiControllerCollectionTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Upload'); $request->setData('name', 'Test Upload');
if (!\is_dir(__DIR__ . '/temp')) { if (!\is_dir(__DIR__ . '/temp')) {
@ -80,7 +80,7 @@ trait ApiControllerCollectionTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Collection'); $request->setData('name', 'Test Collection');
$request->setData('virtualpath', '/'); $request->setData('virtualpath', '/');
$request->setData('media-list', \json_encode($media)); $request->setData('media-list', \json_encode($media));
@ -88,7 +88,7 @@ trait ApiControllerCollectionTrait
$this->module->apiCollectionCreate($request, $response); $this->module->apiCollectionCreate($request, $response);
$collection = $response->get('')['response']; $collection = $response->get('')['response'];
self::assertEquals('Test Collection', $collection->getName()); self::assertEquals('Test Collection', $collection->name);
self::assertCount(2, $collection->getSources()); self::assertCount(2, $collection->getSources());
} }
@ -101,10 +101,10 @@ trait ApiControllerCollectionTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$this->module->apiCollectionCreate($request, $response); $this->module->apiCollectionCreate($request, $response);
self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode()); self::assertEquals(RequestStatusCode::R_400, $response->header->status);
} }
/** /**
@ -116,7 +116,7 @@ trait ApiControllerCollectionTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Collection'); $request->setData('name', 'Test Collection');
$request->setData('path', '/test/path'); $request->setData('path', '/test/path');
@ -135,13 +135,13 @@ trait ApiControllerCollectionTrait
public function testApiCollectionFromMedia() : void public function testApiCollectionFromMedia() : void
{ {
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setDescriptionRaw('descRaw'); $media->descriptionRaw = 'descRaw';
$media->setPath('some/path'); $media->setPath('some/path');
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('Media for collection'); $media->name = 'Media for collection';
$id = MediaMapper::create($media); $id = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
@ -149,7 +149,7 @@ trait ApiControllerCollectionTrait
$collection = $this->module->createMediaCollectionFromMedia('Collection With Media', '', [$media], 1); $collection = $this->module->createMediaCollectionFromMedia('Collection With Media', '', [$media], 1);
self::assertEquals('Collection With Media', $collection->getName()); self::assertEquals('Collection With Media', $collection->name);
self::assertCount(1, $collection->getSources()); self::assertCount(1, $collection->getSources());
self::assertInstanceOf( self::assertInstanceOf(

12
tests/Controller/Api/ApiControllerMediaTrait.php
View File

@ -71,7 +71,7 @@ trait ApiControllerMediaTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Upload'); $request->setData('name', 'Test Upload');
if (!\is_dir(__DIR__ . '/temp')) { if (!\is_dir(__DIR__ . '/temp')) {
@ -119,7 +119,7 @@ trait ApiControllerMediaTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Upload'); $request->setData('name', 'Test Upload');
$request->setData('pathsettings', PathSettings::FILE_PATH); $request->setData('pathsettings', PathSettings::FILE_PATH);
$request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path $request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path
@ -185,7 +185,7 @@ trait ApiControllerMediaTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Test Media'); $request->setData('name', 'Test Media');
$request->setData('pathsettings', PathSettings::FILE_PATH); $request->setData('pathsettings', PathSettings::FILE_PATH);
$request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path $request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path
@ -222,14 +222,14 @@ trait ApiControllerMediaTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('id', $id); $request->setData('id', $id);
$request->setData('name', 'Test Changed'); $request->setData('name', 'Test Changed');
$request->setData('content', 'Test Content'); $request->setData('content', 'Test Content');
$this->module->apiMediaUpdate($request, $response); $this->module->apiMediaUpdate($request, $response);
$media = MediaMapper::get($id); $media = MediaMapper::get($id);
self::assertEquals('Test Changed', $media->getName()); self::assertEquals('Test Changed', $media->name);
self::assertEquals('Test Content', \file_get_contents(__DIR__ . '/../test/path/testFile1.txt')); self::assertEquals('Test Content', \file_get_contents(__DIR__ . '/../test/path/testFile1.txt'));
Directory::delete(__DIR__ . '/../test'); Directory::delete(__DIR__ . '/../test');
@ -244,7 +244,7 @@ trait ApiControllerMediaTrait
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
$request->getHeader()->setAccount(1); $request->header->account = 1;
$request->setData('name', 'Created File'); $request->setData('name', 'Created File');
$request->setData('content', 'file content'); $request->setData('content', 'file content');
$request->setData('filename', 'created.md'); $request->setData('filename', 'created.md');

26
tests/Models/CollectionMapperTest.php
View File

@ -30,26 +30,26 @@ class CollectionMapperTest extends \PHPUnit\Framework\TestCase
public function testCR() : void public function testCR() : void
{ {
$media = new Collection(); $media = new Collection();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setDescriptionRaw('descRaw'); $media->descriptionRaw = 'descRaw';
$media->setPath('some/path'); $media->setPath('some/path');
$media->setSize(11); $media->size = 11;
$media->setName('Collection'); $media->name = 'Collection';
$id = CollectionMapper::create($media); $id = CollectionMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
self::assertEquals($id, $media->getId()); self::assertEquals($id, $media->getId());
$mediaR = CollectionMapper::get($media->getId()); $mediaR = CollectionMapper::get($media->getId());
self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d')); self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId()); self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
self::assertEquals($media->getDescription(), $mediaR->getDescription()); self::assertEquals($media->description, $mediaR->description);
self::assertEquals($media->getDescriptionRaw(), $mediaR->getDescriptionRaw()); self::assertEquals($media->descriptionRaw, $mediaR->descriptionRaw);
self::assertEquals($media->getPath(), $mediaR->getPath()); self::assertEquals($media->getPath(), $mediaR->getPath());
self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute()); self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
self::assertEquals($media->getSize(), $mediaR->getSize()); self::assertEquals($media->size, $mediaR->size);
self::assertEquals($media->getExtension(), $mediaR->getExtension()); self::assertEquals($media->extension, $mediaR->extension);
self::assertEquals($media->getName(), $mediaR->getName()); self::assertEquals($media->name, $mediaR->name);
} }
} }

36
tests/Models/CollectionTest.php
View File

@ -37,14 +37,14 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->media->getId()); self::assertEquals(0, $this->media->getId());
self::assertEquals(0, $this->media->getCreatedBy()->getId()); self::assertEquals(0, $this->media->createdBy->getId());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->getCreatedAt()->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->createdAt->format('Y-m-d'));
self::assertEquals('collection', $this->media->getExtension()); self::assertEquals('collection', $this->media->extension);
self::assertEquals('', $this->media->getPath()); self::assertEquals('', $this->media->getPath());
self::assertEquals('', $this->media->getName()); self::assertEquals('', $this->media->name);
self::assertEquals('', $this->media->getDescription()); self::assertEquals('', $this->media->description);
self::assertEquals(0, $this->media->getSize()); self::assertEquals(0, $this->media->size);
self::assertFalse($this->media->isVersioned()); self::assertFalse($this->media->isVersioned);
self::assertEquals([], $this->media->getSources()); self::assertEquals([], $this->media->getSources());
} }
@ -54,8 +54,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/ */
public function testCreatedByInputOutput() : void public function testCreatedByInputOutput() : void
{ {
$this->media->setCreatedBy(new NullAccount(1)); $this->media->createdBy = new NullAccount(1);
self::assertEquals(1, $this->media->getCreatedBy()->getId()); self::assertEquals(1, $this->media->createdBy->getId());
} }
/** /**
@ -64,8 +64,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/ */
public function testExtensionInputOutput() : void public function testExtensionInputOutput() : void
{ {
$this->media->setExtension('pdf'); $this->media->extension = 'pdf';
self::assertEquals('collection', $this->media->getExtension()); self::assertEquals('pdf', $this->media->extension);
} }
/** /**
@ -77,7 +77,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
$this->media->setPath('/home/root'); $this->media->setPath('/home/root');
self::assertEquals('home/root', $this->media->getPath()); self::assertEquals('home/root', $this->media->getPath());
$this->media->setAbsolute(true); $this->media->isAbsolute = true;
self::assertEquals('/home/root', $this->media->getPath()); self::assertEquals('/home/root', $this->media->getPath());
} }
@ -87,8 +87,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDescriptionInputOutput() : void public function testDescriptionInputOutput() : void
{ {
$this->media->setDescription('This is a description'); $this->media->description = 'This is a description';
self::assertEquals('This is a description', $this->media->getDescription()); self::assertEquals('This is a description', $this->media->description);
} }
/** /**
@ -97,8 +97,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSizeInputOutput() : void public function testSizeInputOutput() : void
{ {
$this->media->setSize(11); $this->media->size = 11;
self::assertEquals(11, $this->media->getSize()); self::assertEquals(11, $this->media->size);
} }
/** /**
@ -107,8 +107,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
*/ */
public function testVersionedInputOutput() : void public function testVersionedInputOutput() : void
{ {
$this->media->setVersioned(true); $this->media->isVersioned = true;
self::assertFalse($this->media->isVersioned()); self::assertTrue($this->media->isVersioned);
} }
/** /**

130
tests/Models/MediaMapperTest.php
View File

@ -32,28 +32,28 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
public function testCR() : void public function testCR() : void
{ {
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setDescriptionRaw('descRaw'); $media->descriptionRaw = 'descRaw';
$media->setPath('some/path'); $media->setPath('some/path');
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('Image'); $media->name = 'Image';
$id = MediaMapper::create($media); $id = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
self::assertEquals($id, $media->getId()); self::assertEquals($id, $media->getId());
$mediaR = MediaMapper::get($media->getId()); $mediaR = MediaMapper::get($media->getId());
self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d')); self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId()); self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
self::assertEquals($media->getDescription(), $mediaR->getDescription()); self::assertEquals($media->description, $mediaR->description);
self::assertEquals($media->getDescriptionRaw(), $mediaR->getDescriptionRaw()); self::assertEquals($media->descriptionRaw, $mediaR->descriptionRaw);
self::assertEquals($media->getPath(), $mediaR->getPath()); self::assertEquals($media->getPath(), $mediaR->getPath());
self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute()); self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
self::assertEquals($media->getSize(), $mediaR->getSize()); self::assertEquals($media->size, $mediaR->size);
self::assertEquals($media->getExtension(), $mediaR->getExtension()); self::assertEquals($media->extension, $mediaR->extension);
self::assertEquals($media->getName(), $mediaR->getName()); self::assertEquals($media->name, $mediaR->name);
} }
/** /**
@ -63,27 +63,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
public function testAbsolute() : void public function testAbsolute() : void
{ {
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setPath('https://avatars0.githubusercontent.com/u/16034994'); $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('Absolute path'); $media->name = 'Absolute path';
$id = MediaMapper::create($media); $id = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
self::assertEquals($id, $media->getId()); self::assertEquals($id, $media->getId());
$mediaR = MediaMapper::get($media->getId()); $mediaR = MediaMapper::get($media->getId());
self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d')); self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId()); self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
self::assertEquals($media->getDescription(), $mediaR->getDescription()); self::assertEquals($media->description, $mediaR->description);
self::assertEquals($media->getPath(), $mediaR->getPath()); self::assertEquals($media->getPath(), $mediaR->getPath());
self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute()); self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
self::assertEquals($media->getSize(), $mediaR->getSize()); self::assertEquals($media->size, $mediaR->size);
self::assertEquals($media->getExtension(), $mediaR->getExtension()); self::assertEquals($media->extension, $mediaR->extension);
self::assertEquals($media->getName(), $mediaR->getName()); self::assertEquals($media->name, $mediaR->name);
} }
/** /**
@ -93,27 +93,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
public function testDirectoryMapping() : void public function testDirectoryMapping() : void
{ {
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setPath(\realpath(__DIR__ . '/../../../../../')); $media->setPath(\realpath(__DIR__ . '/../../../../../'));
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setSize(11); $media->size = 11;
$media->setExtension('collection'); $media->extension = 'collection';
$media->setName('Directory'); $media->name = 'Directory';
$id = MediaMapper::create($media); $id = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
self::assertEquals($id, $media->getId()); self::assertEquals($id, $media->getId());
$mediaR = MediaMapper::get($media->getId()); $mediaR = MediaMapper::get($media->getId());
self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d')); self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId()); self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
self::assertEquals($media->getDescription(), $mediaR->getDescription()); self::assertEquals($media->description, $mediaR->description);
self::assertEquals($media->getPath(), $mediaR->getPath()); self::assertEquals($media->getPath(), $mediaR->getPath());
self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute()); self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
self::assertEquals($media->getSize(), $mediaR->getSize()); self::assertEquals($media->size, $mediaR->size);
self::assertEquals($media->getExtension(), $mediaR->getExtension()); self::assertEquals($media->extension, $mediaR->extension);
self::assertEquals($media->getName(), $mediaR->getName()); self::assertEquals($media->name, $mediaR->name);
} }
/** /**
@ -123,14 +123,14 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
public function testGetVirtualPath() : void public function testGetVirtualPath() : void
{ {
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setPath('https://avatars0.githubusercontent.com/u/16034994'); $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
$media->setVirtualPath('/mediamappertest/path'); $media->setVirtualPath('/mediamappertest/path');
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('With virtual path'); $media->name = 'With virtual path';
$id = MediaMapper::create($media); $id = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
@ -138,14 +138,14 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
$found = MediaMapper::getByVirtualPath($media->getVirtualPath()); $found = MediaMapper::getByVirtualPath($media->getVirtualPath());
$mediaR = \reset($found); $mediaR = \reset($found);
self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d')); self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId()); self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
self::assertEquals($media->getDescription(), $mediaR->getDescription()); self::assertEquals($media->description, $mediaR->description);
self::assertEquals($media->getPath(), $mediaR->getPath()); self::assertEquals($media->getPath(), $mediaR->getPath());
self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute()); self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
self::assertEquals($media->getSize(), $mediaR->getSize()); self::assertEquals($media->size, $mediaR->size);
self::assertEquals($media->getExtension(), $mediaR->getExtension()); self::assertEquals($media->extension, $mediaR->extension);
self::assertEquals($media->getName(), $mediaR->getName()); self::assertEquals($media->name, $mediaR->name);
} }
/** /**
@ -155,27 +155,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
public function testParentcollection() : void public function testParentcollection() : void
{ {
$collection = new Collection(); $collection = new Collection();
$collection->setCreatedBy(new NullAccount(1)); $collection->createdBy = new NullAccount(1);
$collection->setDescription('desc'); $collection->description = 'desc';
$collection->setDescriptionRaw('descRaw'); $collection->descriptionRaw = 'descRaw';
$collection->setPath('some/path'); $collection->setPath('some/path');
$collection->setVirtualPath('/virtual/path'); $collection->setVirtualPath('/virtual/path');
$collection->setSize(11); $collection->size = 11;
$collection->setName('Collection'); $collection->name = 'Collection';
$idCollection = CollectionMapper::create($collection); $idCollection = CollectionMapper::create($collection);
self::assertGreaterThan(0, $collection->getId()); self::assertGreaterThan(0, $collection->getId());
self::assertEquals($idCollection, $collection->getId()); self::assertEquals($idCollection, $collection->getId());
$media = new Media(); $media = new Media();
$media->setCreatedBy(new NullAccount(1)); $media->createdBy = new NullAccount(1);
$media->setDescription('desc'); $media->description = 'desc';
$media->setPath('https://avatars0.githubusercontent.com/u/16034994'); $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
$media->setVirtualPath('/virtual/path/Collection'); $media->setVirtualPath('/virtual/path/Collection');
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setSize(11); $media->size = 11;
$media->setExtension('png'); $media->extension = 'png';
$media->setName('Absolute path'); $media->name = 'Absolute path';
$idMedia = MediaMapper::create($media); $idMedia = MediaMapper::create($media);
self::assertGreaterThan(0, $media->getId()); self::assertGreaterThan(0, $media->getId());
@ -183,6 +183,6 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
$collectionR = MediaMapper::getParentCollection($media->getVirtualPath()); $collectionR = MediaMapper::getParentCollection($media->getVirtualPath());
self::assertEquals($idCollection, $collectionR->getId()); self::assertEquals($idCollection, $collectionR->getId());
self::assertEquals($collection->getName(), $collectionR->getName()); self::assertEquals($collection->name, $collectionR->name);
} }
} }

74
tests/Models/MediaTest.php
View File

@ -36,17 +36,17 @@ class MediaTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->media->getId()); self::assertEquals(0, $this->media->getId());
self::assertEquals(0, $this->media->getCreatedBy()->getId()); self::assertEquals(0, $this->media->createdBy->getId());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->getCreatedAt()->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->createdAt->format('Y-m-d'));
self::assertEquals('', $this->media->getExtension()); self::assertEquals('', $this->media->extension);
self::assertEquals('', $this->media->getPath()); self::assertEquals('', $this->media->getPath());
self::assertFalse($this->media->isAbsolute()); self::assertFalse($this->media->isAbsolute);
self::assertEquals('', $this->media->getName()); self::assertEquals('', $this->media->name);
self::assertEquals('', $this->media->getDescription()); self::assertEquals('', $this->media->description);
self::assertEquals('', $this->media->getDescriptionRaw()); self::assertEquals('', $this->media->descriptionRaw);
self::assertEquals('/', $this->media->getVirtualPath()); self::assertEquals('/', $this->media->getVirtualPath());
self::assertEquals(0, $this->media->getSize()); self::assertEquals(0, $this->media->size);
self::assertFalse($this->media->isVersioned()); self::assertFalse($this->media->isVersioned);
self::assertFalse($this->media->compareNonce('something')); self::assertFalse($this->media->compareNonce('something'));
self::assertFalse($this->media->isEncrypted()); self::assertFalse($this->media->isEncrypted());
} }
@ -57,8 +57,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testCreatedByInputOutput() : void public function testCreatedByInputOutput() : void
{ {
$this->media->setCreatedBy(new NullAccount(1)); $this->media->createdBy = new NullAccount(1);
self::assertEquals(1, $this->media->getCreatedBy()->getId()); self::assertEquals(1, $this->media->createdBy->getId());
} }
/** /**
@ -67,8 +67,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testExtensionInputOutput() : void public function testExtensionInputOutput() : void
{ {
$this->media->setExtension('pdf'); $this->media->extension = 'pdf';
self::assertEquals('pdf', $this->media->getExtension()); self::assertEquals('pdf', $this->media->extension);
} }
/** /**
@ -80,7 +80,7 @@ class MediaTest extends \PHPUnit\Framework\TestCase
$this->media->setPath('/home/root'); $this->media->setPath('/home/root');
self::assertEquals('home/root', $this->media->getPath()); self::assertEquals('home/root', $this->media->getPath());
$this->media->setAbsolute(true); $this->media->isAbsolute = true;
self::assertEquals('/home/root', $this->media->getPath()); self::assertEquals('/home/root', $this->media->getPath());
} }
@ -90,8 +90,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testAbsolutePathInputOutput() : void public function testAbsolutePathInputOutput() : void
{ {
$this->media->setAbsolute(true); $this->media->isAbsolute = true;
self::assertTrue($this->media->isAbsolute()); self::assertTrue($this->media->isAbsolute);
} }
/** /**
@ -100,8 +100,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testNameInputOutput() : void public function testNameInputOutput() : void
{ {
$this->media->setName('Report'); $this->media->name = 'Report';
self::assertEquals('Report', $this->media->getName()); self::assertEquals('Report', $this->media->name);
} }
/** /**
@ -110,8 +110,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDescriptionInputOutput() : void public function testDescriptionInputOutput() : void
{ {
$this->media->setDescription('This is a description'); $this->media->description = 'This is a description';
self::assertEquals('This is a description', $this->media->getDescription()); self::assertEquals('This is a description', $this->media->description);
} }
/** /**
@ -120,8 +120,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDescriptionRawInputOutput() : void public function testDescriptionRawInputOutput() : void
{ {
$this->media->setDescriptionRaw('This is a description raw'); $this->media->descriptionRaw = 'This is a description raw';
self::assertEquals('This is a description raw', $this->media->getDescriptionRaw()); self::assertEquals('This is a description raw', $this->media->descriptionRaw);
} }
/** /**
@ -130,8 +130,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSizeInputOutput() : void public function testSizeInputOutput() : void
{ {
$this->media->setSize(11); $this->media->size = 11;
self::assertEquals(11, $this->media->getSize()); self::assertEquals(11, $this->media->size);
} }
/** /**
@ -140,8 +140,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testVersionedInputOutput() : void public function testVersionedInputOutput() : void
{ {
$this->media->setVersioned(true); $this->media->isVersioned = true;
self::assertTrue($this->media->isVersioned()); self::assertTrue($this->media->isVersioned);
} }
/** /**
@ -160,8 +160,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testHiddenInputOutput() : void public function testHiddenInputOutput() : void
{ {
$this->media->setHidden(true); $this->media->isHidden = true;
self::assertTrue($this->media->isHidden()); self::assertTrue($this->media->isHidden);
} }
/** /**
@ -193,17 +193,17 @@ class MediaTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSerialize() : void public function testSerialize() : void
{ {
$this->media->setCreatedBy($acc = new NullAccount(1)); $this->media->createdBy = $acc = new NullAccount(1);
$this->media->setExtension('pdf'); $this->media->extension = 'pdf';
$this->media->setPath('/home/root'); $this->media->setPath('/home/root');
$this->media->setAbsolute(true); $this->media->isAbsolute = true;
$this->media->setName('Report'); $this->media->name = 'Report';
$this->media->setDescription('This is a description'); $this->media->description = 'This is a description';
$this->media->setDescriptionRaw('This is a description raw'); $this->media->descriptionRaw = 'This is a description raw';
$this->media->setSize(11); $this->media->size = 11;
$this->media->setVersioned(true); $this->media->isVersioned = true;
$this->media->setVirtualPath('/test/path'); $this->media->setVirtualPath('/test/path');
$this->media->setHidden(true); $this->media->isHidden = true;
self::assertEquals($this->media->toArray(), $this->media->jsonSerialize()); self::assertEquals($this->media->toArray(), $this->media->jsonSerialize());

32
tests/Views/MediaViewTest.php
View File

@ -46,7 +46,7 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
); );
$media->setPath(__DIR__); $media->setPath(__DIR__);
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertEquals( self::assertEquals(
__DIR__ . '/MediaViewTest.php', __DIR__ . '/MediaViewTest.php',
$method->invoke($this->view, $media, '/MediaViewTest.php') $method->invoke($this->view, $media, '/MediaViewTest.php')
@ -70,7 +70,7 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
); );
$media->setPath(\realpath(__DIR__ . '/../')); $media->setPath(\realpath(__DIR__ . '/../'));
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertEquals( self::assertEquals(
\realpath(__DIR__ . '/../Controller'), \realpath(__DIR__ . '/../Controller'),
$method->invoke($this->view, $media, '/Controller') $method->invoke($this->view, $media, '/Controller')
@ -88,27 +88,27 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
$media = new Media(); $media = new Media();
$media->setPath(__DIR__); $media->setPath(__DIR__);
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertFalse( self::assertFalse(
$method->invoke($this->view, $media, '/sub/path') $method->invoke($this->view, $media, '/sub/path')
); );
$media->setPath(__DIR__); $media->setPath(__DIR__);
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setExtension('collection'); $media->extension = 'collection';
self::assertFalse( self::assertFalse(
$method->invoke($this->view, $media, '/MediaViewTest.php') $method->invoke($this->view, $media, '/MediaViewTest.php')
); );
$media->setPath(__DIR__ . '/../'); $media->setPath(__DIR__ . '/../');
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertTrue( self::assertTrue(
$method->invoke($this->view, $media, '/Views/') $method->invoke($this->view, $media, '/Views/')
); );
$media->setPath(__DIR__); $media->setPath(__DIR__);
$media->setAbsolute(true); $media->isAbsolute = true;
$media->setExtension('collection'); $media->extension = 'collection';
self::assertTrue( self::assertTrue(
$method->invoke($this->view, $media, '/something') $method->invoke($this->view, $media, '/something')
); );
@ -188,14 +188,14 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
$media = new Media(); $media = new Media();
$media->setPath(__DIR__ . '/test.md'); $media->setPath(__DIR__ . '/test.md');
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertFalse( self::assertFalse(
$method->invoke($this->view, $media) $method->invoke($this->view, $media)
); );
$media->setPath(__DIR__ . '/test.jpg'); $media->setPath(__DIR__ . '/test.jpg');
$media->setExtension('jpg'); $media->extension = 'jpg';
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertTrue( self::assertTrue(
$method->invoke($this->view, $media) $method->invoke($this->view, $media)
); );
@ -212,21 +212,21 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
$media = new Media(); $media = new Media();
$media->setPath(__DIR__ . '/test.jpg'); $media->setPath(__DIR__ . '/test.jpg');
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertFalse( self::assertFalse(
$method->invoke($this->view, $media) $method->invoke($this->view, $media)
); );
$media->setPath(__DIR__ . '/test.md'); $media->setPath(__DIR__ . '/test.md');
$media->setExtension('md'); $media->extension = 'md';
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertTrue( self::assertTrue(
$method->invoke($this->view, $media) $method->invoke($this->view, $media)
); );
$media->setPath(__DIR__ . '/test.jpg'); $media->setPath(__DIR__ . '/test.jpg');
$media->setExtension('jpg'); $media->extension = 'jpg';
$media->setAbsolute(true); $media->isAbsolute = true;
self::assertTrue( self::assertTrue(
$method->invoke($this->view, $media, __DIR__ . '/test.md') $method->invoke($this->view, $media, __DIR__ . '/test.md')
); );