Skip to content

Commit c129cdd

Browse files
gmaxsoftgmaxsoft
committed
Changes to the Twig template and removal of the old SQL file
1 parent 23ed399 commit c129cdd

6 files changed

Lines changed: 34 additions & 766 deletions

File tree

‎.phpunit.result.cache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":2,"defects":{"Tests\\Unit\\Controllers\\SliderControllerTest::testIndexReturnsConfigData":8,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddValidDataReturnsSuccess":5,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddInvalidDataReturnsErrors":5,"Tests\\Unit\\Controllers\\SliderControllerTest::testUpdateCallsServiceWithCorrectData":5,"Tests\\Unit\\Controllers\\SliderControllerTest::testRemoveCallsServiceWithCorrectId":5,"Tests\\Unit\\Controllers\\SliderControllerTest::testSaveConfigCallsServiceWithCorrectData":5,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileValidFile":7,"Tests\\Unit\\Services\\SliderServiceTest::testGetSliderByIdReturnsSlider":8,"Tests\\Unit\\Services\\SliderServiceTest::testCreateSliderSuccess":8,"Tests\\Unit\\Services\\SliderServiceTest::testCreateSliderValidationError":8,"Tests\\Unit\\Services\\SliderServiceTest::testDeleteSliderSuccess":8,"Tests\\Unit\\Services\\SliderServiceTest::testDeleteSliderNotFound":8,"Tests\\Unit\\Services\\SliderServiceTest::testUpdateSliderInlineSuccess":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testGetBlockByIdReturnsBlock":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockSuccess":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataValid":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataInvalid":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testDeleteBlockInvalidId":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testUpdateBlockInlineInvalidId":8,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithLongText":7,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithEmptyText":7,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithCustomEnd":7},"times":{"Tests\\Unit\\Controllers\\SliderControllerTest::testIndexReturnsConfigData":0.017,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddValidDataReturnsSuccess":0.001,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddInvalidDataReturnsErrors":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testUpdateCallsServiceWithCorrectData":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testRemoveCallsServiceWithCorrectId":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testSaveConfigCallsServiceWithCorrectData":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileValidImage":0.001,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileInvalidType":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileTooLarge":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileUploadError":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileNoTmpName":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileValidFile":0.002,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileInvalidFile":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testGetBlockByIdReturnsBlock":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockSuccess":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockValidationError":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataValid":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataInvalid":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testDeleteBlockInvalidId":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testUpdateBlockInlineInvalidId":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testDayOfWeekReturnsCorrectGreeting":0.001,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithLongText":0.001,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithShortText":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithEmptyText":0.001,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithCustomEnd":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWordBoundaries":0.001}}
1+
{"version":2,"defects":{"Tests\\Unit\\Controllers\\SliderControllerTest::testIndexReturnsConfigData":5,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddValidDataReturnsSuccess":8,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddInvalidDataReturnsErrors":2,"Tests\\Unit\\Controllers\\SliderControllerTest::testUpdateCallsServiceWithCorrectData":2,"Tests\\Unit\\Controllers\\SliderControllerTest::testRemoveCallsServiceWithCorrectId":2,"Tests\\Unit\\Controllers\\SliderControllerTest::testSaveConfigCallsServiceWithCorrectData":2,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileValidFile":7,"Tests\\Unit\\Services\\SliderServiceTest::testGetSliderByIdReturnsSlider":8,"Tests\\Unit\\Services\\SliderServiceTest::testCreateSliderSuccess":8,"Tests\\Unit\\Services\\SliderServiceTest::testCreateSliderValidationError":8,"Tests\\Unit\\Services\\SliderServiceTest::testDeleteSliderSuccess":8,"Tests\\Unit\\Services\\SliderServiceTest::testDeleteSliderNotFound":8,"Tests\\Unit\\Services\\SliderServiceTest::testUpdateSliderInlineSuccess":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testGetBlockByIdReturnsBlock":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockSuccess":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataValid":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataInvalid":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testDeleteBlockInvalidId":8,"Tests\\Unit\\Services\\StaticBlockServiceTest::testUpdateBlockInlineInvalidId":8,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithLongText":7,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithEmptyText":7,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithCustomEnd":7},"times":{"Tests\\Unit\\Controllers\\SliderControllerTest::testIndexReturnsConfigData":0.004,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddValidDataReturnsSuccess":0.006,"Tests\\Unit\\Controllers\\SliderControllerTest::testAddInvalidDataReturnsErrors":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testUpdateCallsServiceWithCorrectData":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testRemoveCallsServiceWithCorrectId":0,"Tests\\Unit\\Controllers\\SliderControllerTest::testSaveConfigCallsServiceWithCorrectData":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileValidImage":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileInvalidType":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileTooLarge":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileUploadError":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testValidateFileNoTmpName":0,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileValidFile":0.001,"Tests\\Unit\\Services\\FileUploadServiceTest::testUploadFileInvalidFile":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testGetBlockByIdReturnsBlock":0.003,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockSuccess":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testCreateBlockValidationError":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataValid":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testValidateBlockDataInvalid":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testDeleteBlockInvalidId":0,"Tests\\Unit\\Services\\StaticBlockServiceTest::testUpdateBlockInlineInvalidId":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testDayOfWeekReturnsCorrectGreeting":0.001,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithLongText":0.002,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithShortText":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithEmptyText":0.001,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWithCustomEnd":0,"Tests\\Unit\\Services\\TextUtilitiesTest::testSubstrwordsWordBoundaries":0}}

‎app/Services/TemplateRenderer.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
use Twig\Environment;
66
use Twig\Loader\FilesystemLoader;
7-
use voku\helper\HtmlMin;
8-
use voku\twig\MinifyHtmlExtension;
97
use Pecee\SimpleRouter\SimpleRouter;
108
use App\Controllers\AuthController;
119
use App\Controllers\NavigationCmsController;
@@ -34,16 +32,15 @@ private function initializeTwig(): void
3432
{
3533
$csrf_token = SimpleRouter::router()->getCsrfVerifier()->getTokenProvider()->getToken();
3634
$loader = new FilesystemLoader(dirname(__DIR__, 2) . '/app/Views');
37-
self::$twig = new Environment($loader);
35+
self::$twig = new Environment($loader, ['auto_reload' => true]);
3836

3937
// Kompresja HTML
40-
$minifier = new HtmlMin();
41-
self::$twig->addExtension(new MinifyHtmlExtension($minifier));
42-
38+
self::$twig->getExtensions();
4339
self::$twig->addGlobal('userinfo', $_SESSION['userinfo'] ?? null);
4440
self::$twig->addGlobal('frontend_url', $_ENV['FRONTEND_URL'] ?? null);
4541
self::$twig->addGlobal('csrf_token', $csrf_token);
4642
self::$twig->addGlobal('isLoggedIn', AuthController::isLoggedIn());
43+
//$twig->addGlobal('messages', \Core\Messages::getMessages());
4744
//self::$twig->addGlobal('currentUser', \App\Controllers\AuthController::getUser());
4845

4946
$menuController = new NavigationCmsController();

‎app/Views/header_main.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{% spaceless %}
21
<!doctype html>
32
<html lang="pl">
43
<html>
@@ -83,5 +82,4 @@
8382
{% endblock %}
8483
</body>
8584

86-
</html>
87-
{% endspaceless %}
85+
</html>

‎composer.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/View.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
*/
1111
class View
1212
{
13-
private static ?TemplateRendererInterface $templateRenderer = null;
13+
private static ?TemplateRendererInterface $templateRenderer = null;
1414

15-
public static function setTemplateRenderer(TemplateRendererInterface $renderer): void
16-
{
17-
self::$templateRenderer = $renderer;
18-
}
15+
public static function setTemplateRenderer(TemplateRendererInterface $renderer): void
16+
{
17+
self::$templateRenderer = $renderer;
18+
}
1919

2020
/**
2121
* Render a view file
@@ -36,35 +36,35 @@ public static function render($view, $args = [])
3636

3737
public static function redirect($url)
3838
{
39-
if (self::$templateRenderer) {
40-
self::$templateRenderer->redirect($url);
41-
} else {
42-
// Fallback dla kompatybilności wstecznej
43-
header('Location: http://' . $_SERVER['HTTP_HOST'] . $url, true, 303);
44-
exit();
45-
}
39+
if (self::$templateRenderer) {
40+
self::$templateRenderer->redirect($url);
41+
} else {
42+
// Fallback dla kompatybilności wstecznej
43+
header('Location: http://' . $_SERVER['HTTP_HOST'] . $url, true, 303);
44+
exit();
45+
}
4646
}
4747

4848
public static function renderTemplate($template, $args = [])
4949
{
50-
if (self::$templateRenderer) {
51-
self::$templateRenderer->render($template, $args);
52-
} else {
53-
// Fallback dla kompatybilności wstecznej - używamy starej implementacji
54-
self::legacyRenderTemplate($template, $args);
55-
}
50+
if (self::$templateRenderer) {
51+
self::$templateRenderer->render($template, $args);
52+
} else {
53+
// Fallback dla kompatybilności wstecznej - używamy starej implementacji
54+
self::legacyRenderTemplate($template, $args);
55+
}
5656
}
5757

58-
/**
59-
* Legacy method for backward compatibility
60-
*/
58+
/**
59+
* Legacy method for backward compatibility
60+
*/
6161
private static function legacyRenderTemplate($template, $args = [])
6262
{
6363
static $twig = null;
6464
if ($twig === null) {
6565
$csrf_token = \Pecee\SimpleRouter\SimpleRouter::router()->getCsrfVerifier()->getTokenProvider()->getToken();
6666
$loader = new \Twig\Loader\FilesystemLoader(dirname(__DIR__) . '/app/Views');
67-
$twig = new \Twig\Environment($loader);
67+
$twig = new \Twig\Environment($loader, ['auto_reload' => true]);
6868

6969
// Używamy natywnego Twig spaceless tag dla kompresji HTML
7070
$twig->addGlobal('userinfo', $_SESSION['userinfo'] ?? null);

0 commit comments

Comments
 (0)