Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 15:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(tests): UT for MinifyCss

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2023-12-06 12:44:01 +01:00
parent 6f05a914ef
commit dfec9bbd06
6 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/web/Controllers/Resource/CssController.php
View File

@@ -24,6 +24,7 @@
namespace SP\Modules\Web\Controllers\Resource;
use SP\Http\Request as HttpRequest;
use SP\Infrastructure\File\FileHandler;
use SP\Util\FileUtil;
@@ -50,9 +51,9 @@ final class CssController extends ResourceBase
$base = $this->request->analyzeString('b');
if ($file && $base) {
$files = $this->buildFiles(urldecode($base), explode(',', urldecode($file)));
$files = $this->buildFiles(urldecode($base), explode(',', urldecode($file)), true);
$this->minify->builder(true)
$this->minify->builder()
->addFiles($files)
->getMinified();
} else {
@@ -68,10 +69,13 @@ final class CssController extends ResourceBase
/**
* @param string $base
* @param array $files
* @param bool $insecure
* @return FileHandler[]
*/
private function buildFiles(string $base, array $files): array
private function buildFiles(string $base, array $files, bool $insecure = false): array
{
$base = $insecure ? HttpRequest::getSecureAppPath($base) : $base;
return array_map(
fn(string $file) => new FileHandler(FileUtil::buildPath($base, $file)),
$files

10
app/modules/web/Controllers/Resource/JsController.php
View File

@@ -24,6 +24,7 @@
namespace SP\Modules\Web\Controllers\Resource;
use SP\Http\Request as HttpRequest;
use SP\Infrastructure\File\FileHandler;
use SP\Util\FileUtil;
@@ -67,9 +68,9 @@ final class JsController extends ResourceBase
$base = $this->request->analyzeString('b');
if ($file && $base) {
$files = $this->buildFiles(urldecode($base), explode(',', urldecode($file)));
$files = $this->buildFiles(urldecode($base), explode(',', urldecode($file)), true);
$this->minify->builder(true)
$this->minify->builder()
->addFiles($files)
->getMinified();
} else {
@@ -95,10 +96,13 @@ final class JsController extends ResourceBase
/**
* @param string $base
* @param array $files
* @param bool $insecure
* @return FileHandler[]
*/
private function buildFiles(string $base, array $files): array
private function buildFiles(string $base, array $files, bool $insecure = false): array
{
$base = $insecure ? HttpRequest::getSecureAppPath($base) : $base;
return array_map(
fn(string $file) => new FileHandler(FileUtil::buildPath($base, $file)),
$files

10
lib/SP/Domain/Html/MinifyFile.php
View File

@@ -35,8 +35,7 @@ final class MinifyFile
{
public function __construct(
private readonly FileHandlerInterface $fileHandler,
private readonly bool $minify,
private readonly bool $insecure
private readonly bool $minify
) {
}
@@ -55,13 +54,6 @@ final class MinifyFile
return HttpRequest::getSecureAppFile($this->fileHandler->getName(), $this->fileHandler->getBase());
}
public function getBase(): string
{
return $this->insecure ? HttpRequest::getSecureAppPath(
$this->fileHandler->getBase()
) : $this->fileHandler->getBase();
}
/**
* @throws FileException
*/

6
lib/SP/Domain/Html/MinifyInterface.php
View File

@@ -55,9 +55,5 @@ interface MinifyInterface
*/
public function addFiles(array $files, bool $minify = true): MinifyInterface;
/**
* @param bool $insecure Whether the $base path is insecure
* @return MinifyInterface
*/
public function builder(bool $insecure = false): MinifyInterface;
public function builder(): MinifyInterface;
}

7
lib/SP/Html/Minify.php
View File

@@ -164,11 +164,8 @@ abstract class Minify implements MinifyInterface
return $this;
}
public function builder(bool $insecure = false): MinifyInterface
public function builder(): MinifyInterface
{
$clone = clone $this;
$clone->insecure = $insecure;
return $clone;
return clone $this;
}
}

7
tests/SP/Html/MinifyCssTest.php
View File

@@ -234,13 +234,6 @@ class MinifyCssTest extends UnitaryTestCase
self::assertNotEquals(spl_object_id($this->minifyCss), spl_object_id($out));
}
public function testBuilderWithInsecure()
{
$out = $this->minifyCss->builder(true);
self::assertNotEquals(spl_object_id($this->minifyCss), spl_object_id($out));
}
/**
* @throws Exception
* @throws FileException