Merge pull request #17 from osomstudio/twig2

Twig2
osomstudio · Mar 15, 2024 · ab7145a · ab7145a
2 parents ebdd6e7 + a7fc644
commit ab7145a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     "oscarotero/env": "^2.1",
     "roots/bedrock-autoloader": "^1.0",
     "roots/bedrock-disallow-indexing": "^2.0",
-    "roots/wordpress": "6.2",
+    "roots/wordpress": "6.4.3",
     "roots/wp-config": "1.0.0",
     "roots/wp-password-bcrypt": "1.0.0",
     "soberwp/models": "dev-master",

diff --git a/web/app/themes/juniper-theme/archive.php b/web/app/themes/juniper-theme/archive.php
@@ -35,6 +35,6 @@
 	array_unshift( $templates, 'archive-' . get_post_type() . '.twig' );
 }
 
-$context['posts'] = new Timber\PostQuery();
+$context['posts'] = Timber::get_post();
 
 Timber::render( $templates, $context );
diff --git a/web/app/themes/juniper-theme/author.php b/web/app/themes/juniper-theme/author.php
@@ -12,7 +12,7 @@
 global $wp_query;
 
 $context          = Timber::context();
-$context['posts'] = new Timber\PostQuery();
+$context['posts'] = Timber::get_post();
 if ( isset( $wp_query->query_vars['author'] ) ) {
 	$author            = new Timber\User( $wp_query->query_vars['author'] );
 	$context['author'] = $author;

diff --git a/web/app/themes/juniper-theme/class-startersite.php b/web/app/themes/juniper-theme/class-startersite.php
@@ -19,7 +19,6 @@ public function __construct() {
 	 * @param string $context context['this'] Being the Twig's {{ this }}.
 	 */
 	public function add_to_context( $context ) {
-		$context['menu'] = new Timber\Menu();
 		$context['site'] = $this;
 		return $context;
 	}

diff --git a/web/app/themes/juniper-theme/composer.json b/web/app/themes/juniper-theme/composer.json
@@ -2,7 +2,7 @@
     "name": "junipertheme/junipertheme",
     "type": "library",
     "require": {
-        "timber/timber": "^1.19",
+        "timber/timber": "^2.0",
         "palmiak/timber-acf-wp-blocks": "^1.15"
     },
     "autoload": {
@@ -15,5 +15,10 @@
             "name": "bartnovak",
             "email": "b.nowak@osomstudio.com"
         }
-    ]
+    ],
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
+    }
 }
diff --git a/web/app/themes/juniper-theme/functions.php b/web/app/themes/juniper-theme/functions.php
@@ -17,7 +17,7 @@
 
 if ( file_exists( $composer_autoload ) ) {
 	require_once $composer_autoload;
-	$timber = new Timber\Timber();
+	Timber\Timber::init();
 }
 
 require_once 'inc/include.php';

diff --git a/web/app/themes/juniper-theme/index.php b/web/app/themes/juniper-theme/index.php
@@ -14,7 +14,7 @@
  */
 
 $context          = Timber::context();
-$context['posts'] = new Timber\PostQuery();
+$context['posts'] = Timber::get_post();
 $context['foo']   = 'bar';
 $templates        = array( 'index.twig' );
 if ( is_home() ) {

diff --git a/web/app/themes/juniper-theme/search.php b/web/app/themes/juniper-theme/search.php
@@ -13,6 +13,6 @@
 
 $context          = Timber::context();
 $context['title'] = 'Search results for ' . get_search_query();
-$context['posts'] = new Timber\PostQuery();
+$context['posts'] = Timber::get_post();
 
 Timber::render( $templates, $context );