mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-01 22:14:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug that wrong function was called.

Browse source
This commit is contained in:
Jan Böhmer 2020-05-31 15:03:27 +02:00
parent d9c83d8bb2
commit 3021d0d67a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -455,7 +455,7 @@ abstract class Attachment extends AbstractNamedDBElement
* *
* @return bool True if the string is a valid URL. False, if the string is not an URL or invalid. * @return bool True if the string is a valid URL. False, if the string is not an URL or invalid.
*/ */
public static function isURL(string $string, bool $path_required = true, bool $only_http = true): bool public static function isValidURL(string $string, bool $path_required = true, bool $only_http = true): bool
{ {
if ($only_http) { //Check if scheme is HTTPS or HTTP if ($only_http) { //Check if scheme is HTTPS or HTTP
$scheme = parse_url($string, PHP_URL_SCHEME); $scheme = parse_url($string, PHP_URL_SCHEME);

8
tests/Entity/Attachments/AttachmentTest.php
View file

@ -285,14 +285,14 @@ class AttachmentTest extends TestCase
public function testIsURL(): void public function testIsURL(): void
{ {
$url = '%MEDIA%/test.txt'; $url = '%MEDIA%/test.txt';
$this->assertFalse(Attachment::isURL($url)); $this->assertFalse(Attachment::isValidURL($url));
$url = 'https://google.de'; $url = 'https://google.de';
$this->assertFalse(Attachment::isURL($url)); $this->assertFalse(Attachment::isValidURL($url));
$url = 'ftp://google.de'; $url = 'ftp://google.de';
$this->assertTrue(Attachment::isURL($url, false, false)); $this->assertTrue(Attachment::isValidURL($url, false, false));
$this->assertFalse(Attachment::isURL($url, false, true)); $this->assertFalse(Attachment::isValidURL($url, false, true));
} }
/** /**