mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-09 18:04:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some inspection issues.

Browse source
This commit is contained in:
Jan Böhmer 2019-09-16 22:04:59 +02:00
parent f7c2f1032f
commit 21a81486df
24 changed files with 64 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,11 +23,9 @@ declare(strict_types=1);
namespace App\Entity\Attachments;
use App\Entity\Base\DBElement;
use App\Entity\Base\NamedDBElement;
use App\Validator\Constraints\Selectable;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/**
* Class Attachment.
@ -52,7 +50,7 @@ abstract class Attachment extends NamedDBElement
* @var string The filename using the %BASE% variable
* @ORM\Column(type="string", name="filename")
*/
protected $path = "";
protected $path = '';
/**
* ORM mapping is done in sub classes (like PartAttachment)
@ -101,8 +99,8 @@ abstract class Attachment extends NamedDBElement
{
//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%') === false)
&& (strpos($this->getPath(), '%BASE') === false);
}
/********************************************************************************
@ -270,7 +268,7 @@ abstract class Attachment extends NamedDBElement
//Only set if the URL is not empty
if (!empty($url)) {
if (strpos($url, '%BASE%') !== false || strpos($url, '%MEDIA%') !== false) {
throw new \InvalidArgumentException("You can not reference internal files via the url field! But nice try!");
throw new \InvalidArgumentException('You can not reference internal files via the url field! But nice try!');
}
$this->path = $url;