Merge branch '2.x' into 3072-timberattachmentpath-returns-incorrect-v…

…alue
timber · Dec 17, 2024 · 097d0d1 · 097d0d1
2 parents 6a0daf9 + 72a013e
commit 097d0d1
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
   },
   "require": {
     "php": "^8.1",
-    "twig/twig": "^3.5"
+    "twig/twig": "^3.16"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.28",

diff --git a/src/Twig.php b/src/Twig.php
@@ -14,6 +14,7 @@
 use Twig\Runtime\EscaperRuntime;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
+use Twig\DeprecatedCallableInfo;
 
 /**
  * Class Twig
@@ -100,7 +101,13 @@ public function get_timber_functions()
                     return $post_factory->from($post_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_post() }} or {{ get_posts() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'TimberPost' => [
@@ -109,7 +116,13 @@ public function get_timber_functions()
                     return $post_factory->from($post_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_post() }} or {{ get_posts() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'Image' => [
@@ -118,7 +131,13 @@ public function get_timber_functions()
                     return $post_factory->from($post_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_image() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'TimberImage' => [
@@ -127,7 +146,13 @@ public function get_timber_functions()
                     return $post_factory->from($post_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_image() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'Term' => [
@@ -136,7 +161,13 @@ public function get_timber_functions()
                     return $termFactory->from($term_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_term() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'TimberTerm' => [
@@ -145,7 +176,13 @@ public function get_timber_functions()
                     return $termFactory->from($term_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_term() }} or {{ get_terms() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'User' => [
@@ -154,7 +191,13 @@ public function get_timber_functions()
                     return Timber::get_user($user_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_user() }} or {{ get_users() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'TimberUser' => [
@@ -163,7 +206,13 @@ public function get_timber_functions()
                     return Timber::get_user($user_id);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ get_user() }} or {{ get_users() }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'shortcode' => [
@@ -299,7 +348,13 @@ public function get_timber_filters()
                     return $obj::class;
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: "{{ function('get_class', my_object) }}",
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],
             'print_r' => [
@@ -308,7 +363,13 @@ public function get_timber_filters()
                     return \print_r($arr, true);
                 },
                 'options' => [
-                    'deprecated' => true,
+                    'deprecation_info' => new DeprecatedCallableInfo(
+                        package: 'timber/timber',
+                        version: '2.0.0',
+                        altName: '{{ dump(my_object) }}',
+                        altPackage: null,
+                        altVersion: null
+                    ),
                 ],
             ],