mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-25 19:28:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some more tests.

Browse source 
Also changed the behavior of some code to meet the expectation.
This commit is contained in:
Jan Böhmer 2019-09-22 23:47:40 +02:00
parent 322778af68
commit a97d016740
8 changed files with 523 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Entity/Attachments/Attachment.php
View file

@ -103,10 +103,9 @@ abstract class Attachment extends NamedDBElement
*/
public function isExternal() : bool
{
//return static::isUrl($this->getPath());
//Treat all pathes without a filepath as external
return (strpos($this->getPath(), '%MEDIA%') === false)
&& (strpos($this->getPath(), '%BASE') === false);
return (strpos($this->getPath(), '%MEDIA%') !== 0)
&& (strpos($this->getPath(), '%BASE%') !== 0);
}
/********************************************************************************
@ -118,11 +117,15 @@ abstract class Attachment extends NamedDBElement
/**
* Returns the extension of the file referenced via the attachment.
* For a path like %BASE/path/foo.bar, bar will be returned.
* @return string
* If this attachment is external null is returned.
* @return string|null The file extension in lower case.
*/
public function getExtension() : string
public function getExtension() : ?string
{
return pathinfo($this->getPath(), PATHINFO_EXTENSION);
if ($this->isExternal()) {
return null;
}
return strtolower(pathinfo($this->getPath(), PATHINFO_EXTENSION));
}
/**