From 9536d9e78a557488192c61e09bb4ec14ea83bb2f Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <me@pabloferreiro.es>
Date: Tue, 20 Aug 2024 21:08:05 +0200
Subject: [PATCH] bump latte

---
 app/Helpers/Wrappers.php               |  4 ++--
 composer.json                          |  2 +-
 composer.lock                          | 30 ++++++++++++++------------
 templates/components/head.latte        |  8 +++----
 templates/components/navbar.latte      |  2 +-
 templates/components/themes/card.latte |  4 ++--
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/Helpers/Wrappers.php b/app/Helpers/Wrappers.php
index ac4ff55..475198c 100644
--- a/app/Helpers/Wrappers.php
+++ b/app/Helpers/Wrappers.php
@@ -24,7 +24,7 @@ class Wrappers {
         });
 
         // Static assets
-        $latte->addFunction('static', function (string $type, string $file, bool $isVendor = false): string {
+        $latte->addFunction('assets', function (string $type, string $file, bool $isVendor = false): string {
             $endpoint = '';
             switch ($type) {
                 case 'js':
@@ -34,7 +34,7 @@ class Wrappers {
                     $endpoint .= '/styles';
                     break;
                 default:
-                    throw new \Exception('Invalid static asset type');
+                    throw new \Exception('Invalid asset type');
             }
 
             if ($isVendor) $endpoint .= '/vendor';
diff --git a/composer.json b/composer.json
index 844c6e2..1f9279c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     "require": {
         "php": "^8.1",
         "ext-mbstring": "*",
-        "latte/latte": "^2.11",
+        "latte/latte": "^3.0",
         "bramus/router": "^1.6",
         "pablouser1/tikscraper": "^2.5",
         "josegonzalez/dotenv": "^4.0"
diff --git a/composer.lock b/composer.lock
index 2c8d0f5..c21da3b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "98ad54f403100fdc789680d1e3704ef2",
+    "content-hash": "936f452f45ae22eb0bd1fe3a177c0854",
     "packages": [
         {
             "name": "bramus/router",
@@ -441,36 +441,38 @@
         },
         {
             "name": "latte/latte",
-            "version": "v2.11.7",
+            "version": "v3.0.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/latte.git",
-                "reference": "0ac0843a459790d471821f6a82f5d13db831a0d3"
+                "reference": "fca0a3eddd70213201b3b3abec0cb8dde7bbc259"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/0ac0843a459790d471821f6a82f5d13db831a0d3",
-                "reference": "0ac0843a459790d471821f6a82f5d13db831a0d3",
+                "url": "https://api.github.com/repos/nette/latte/zipball/fca0a3eddd70213201b3b3abec0cb8dde7bbc259",
+                "reference": "fca0a3eddd70213201b3b3abec0cb8dde7bbc259",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "7.1 - 8.3"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
-                "nette/application": "<2.4.1"
+                "nette/application": "<3.1.7",
+                "nette/caching": "<3.1.4"
             },
             "require-dev": {
-                "nette/php-generator": "^3.3.4",
-                "nette/tester": "^2.0",
-                "nette/utils": "^3.0",
+                "nette/php-generator": "^4.0",
+                "nette/tester": "^2.5",
+                "nette/utils": "^4.0",
                 "phpstan/phpstan": "^1",
-                "tracy/tracy": "^2.3"
+                "tracy/tracy": "^2.10"
             },
             "suggest": {
                 "ext-fileinfo": "to use filter |datastream",
                 "ext-iconv": "to use filters |reverse, |substring",
+                "ext-intl": "to use Latte\\Engine::setLocale()",
                 "ext-mbstring": "to use filters like lower, upper, capitalize, ...",
                 "nette/php-generator": "to use tag {templatePrint}",
                 "nette/utils": "to use filter |webalize"
@@ -481,7 +483,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -519,9 +521,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v2.11.7"
+                "source": "https://github.com/nette/latte/tree/v3.0.18"
             },
-            "time": "2023-10-18T17:16:11+00:00"
+            "time": "2024-08-06T07:58:55+00:00"
         },
         {
             "name": "m1/env",
diff --git a/templates/components/head.latte b/templates/components/head.latte
index d7dd4c6..068c2c6 100644
--- a/templates/components/head.latte
+++ b/templates/components/head.latte
@@ -29,9 +29,9 @@
 	{if isset($has_rss)}
 		<link rel="alternate" type="application/rss+xml" title="{$title}" href="{$_SERVER['REQUEST_URI'] . '/rss'}" />
 	{/if}
-	<link rel="stylesheet" href="{static('css', 'cssgg.min.css', true)}">
-	<link rel="stylesheet" href="{static('css', 'bulma.min.css', true)}">
-	<link rel="stylesheet" href="{static('css', 'misc.css')}">
-	<link rel="stylesheet" href="{static('css', 'carousel.css')}">
+	<link rel="stylesheet" href="{assets('css', 'cssgg.min.css', true)}">
+	<link rel="stylesheet" href="{assets('css', 'bulma.min.css', true)}">
+	<link rel="stylesheet" href="{assets('css', 'misc.css')}">
+	<link rel="stylesheet" href="{assets('css', 'carousel.css')}">
 	<title>{$title} - ProxiTok</title>
 </head>
diff --git a/templates/components/navbar.latte b/templates/components/navbar.latte
index 04d7290..c7b6100 100644
--- a/templates/components/navbar.latte
+++ b/templates/components/navbar.latte
@@ -26,4 +26,4 @@
 		</div>
   </div>
 </nav>
-<script src="{static('js', 'navbar.js')}"></script>
+<script src="{assets('js', 'navbar.js')}"></script>
diff --git a/templates/components/themes/card.latte b/templates/components/themes/card.latte
index 21eff34..582915e 100644
--- a/templates/components/themes/card.latte
+++ b/templates/components/themes/card.latte
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="{static('css', 'themes/card.css')}">
+<link rel="stylesheet" href="{assets('css', 'themes/card.css')}">
 <section class="section">
 	<noscript>JavaScript is required for this section to work!</noscript>
   <div class="columns is-multiline is-vcentered">
@@ -67,4 +67,4 @@
     </footer>
   </div>
 </div>
-<script src="{static('js', 'themes/card.js')}"></script>
+<script src="{assets('js', 'themes/card.js')}"></script>