From 51376a43919cba7a5037edb7cc31f18b5950437b Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 4 May 2015 23:50:16 +0200
Subject: [ticket/13638] Inject $filesystem in \phpbb\template\asset

PHPBB3-13638
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 15195a226b..324823b8d7 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -39,7 +39,7 @@ abstract class includeasset extends \Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper());\n")
+			->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper(), \$this->getEnvironment()->get_filesystem());\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-- 
cgit v1.2.1


From 4c004748453babcb8f0a277227c366a71c8c1bc6 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Fri, 18 Sep 2015 21:23:34 +0200
Subject: [ticket/12633] Doesn't use DEBUG to debug templates events

Check the templates events on runtime only when Twig debug is on

PHPBB3-12633
---
 phpBB/phpbb/template/twig/node/event.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index b765bde98d..11fdb75247 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -46,7 +46,7 @@ class event extends \Twig_Node
 		{
 			$ext_namespace = str_replace('/', '_', $ext_namespace);
 
-			if (defined('DEBUG'))
+			if ($this->environment->isDebug())
 			{
 				// If debug mode is enabled, lets check for new/removed EVENT
 				//  templates on page load rather than at compile. This is
@@ -58,7 +58,7 @@ class event extends \Twig_Node
 				;
 			}
 
-			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+			if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
 			{
 				$compiler
 					->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
@@ -70,7 +70,7 @@ class event extends \Twig_Node
 				;
 			}
 
-			if (defined('DEBUG'))
+			if ($this->environment->isDebug())
 			{
 				$compiler
 					->outdent()
-- 
cgit v1.2.1


From 73e6e5b77faadbb7676961bf38122d669de111db Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Dec 2015 17:50:29 +0100
Subject: [ticket/13454] Remove unused variables

This is the first part of the changes. More to come.

PHPBB3-13454
---
 phpBB/phpbb/template/twig/node/includejs.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 0f67f9ff60..e77f2afeed 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -28,8 +28,6 @@ class includejs extends \phpbb\template\twig\node\includeasset
 	*/
 	protected function append_asset(\Twig_Compiler $compiler)
 	{
-		$config = $this->environment->get_phpbb_config();
-
 		$compiler
 			->raw("<script type=\"text/javascript\" src=\"' . ")
 			->raw("\$asset_file")
-- 
cgit v1.2.1


From 52b3d54805af6d0a89ede1cd2acac92cd95693c0 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sun, 17 Jan 2016 20:11:36 +0100
Subject: [ticket/13717] Set the assets after rendering the whole template

The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717
---
 phpBB/phpbb/template/twig/node/includeasset.php | 27 +++++++------------------
 phpBB/phpbb/template/twig/node/includecss.php   | 16 ++-------------
 phpBB/phpbb/template/twig/node/includejs.php    | 16 ++-------------
 3 files changed, 11 insertions(+), 48 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 324823b8d7..3d3c6e4df8 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -49,33 +49,20 @@ abstract class includeasset extends \Twig_Node
 					->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")
 					->write("\$asset->set_path(\$local_file, true);\n")
 				->outdent()
-				->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
-				->write("\$asset_file = \$asset->get_url();\n")
 				->write("}\n")
+				->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
 			->outdent()
 			->write("}\n")
-			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
-		;
-
-		$this->append_asset($compiler);
-
-		$compiler
-			->raw("\n');\n")
+			->write("\$context['definition']->set('STYLESHEETS', '__STYLESHEETS_PLACEHOLDER__');\n")
+			->write("\$context['definition']->set('SCRIPTS', '__SCRIPTS_PLACEHOLDER__');\n")
+			->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);")
 		;
 	}
 
 	/**
-	* Get the definition name
+	* Get the name of the assets bag setter
 	*
-	* @return string (e.g. 'SCRIPTS')
-	*/
-	abstract public function get_definition_name();
-
-	/**
-	* Append the output code for the asset
-	*
-	* @param \Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* @return string (e.g. 'script')
 	*/
-	abstract protected function append_asset(\Twig_Compiler $compiler);
+	abstract public function get_setters_name();
 }
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 2dac154036..2e97d4972d 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -18,20 +18,8 @@ class includecss extends \phpbb\template\twig\node\includeasset
 	/**
 	* {@inheritdoc}
 	*/
-	public function get_definition_name()
+	public function get_setters_name()
 	{
-		return 'STYLESHEETS';
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function append_asset(\Twig_Compiler $compiler)
-	{
-		$compiler
-			->raw("<link href=\"' . ")
-			->raw("\$asset_file . '\"")
-			->raw(' rel="stylesheet" type="text/css" media="screen" />')
-		;
+		return 'stylesheet';
 	}
 }
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index e77f2afeed..505b49757b 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -18,20 +18,8 @@ class includejs extends \phpbb\template\twig\node\includeasset
 	/**
 	* {@inheritdoc}
 	*/
-	public function get_definition_name()
+	public function get_setters_name()
 	{
-		return 'SCRIPTS';
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	protected function append_asset(\Twig_Compiler $compiler)
-	{
-		$compiler
-			->raw("<script type=\"text/javascript\" src=\"' . ")
-			->raw("\$asset_file")
-			->raw(". '\"></script>\n")
-		;
+		return 'script';
 	}
 }
-- 
cgit v1.2.1


From 94f87d931854bf25fb051a27be9a1883510389c4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Feb 2016 17:06:12 +0100
Subject: [ticket/14446] Add predefined placeholder variables to twig
 definition

PHPBB3-14446
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 3d3c6e4df8..6d50eafc9d 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -53,8 +53,6 @@ abstract class includeasset extends \Twig_Node
 				->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
 			->outdent()
 			->write("}\n")
-			->write("\$context['definition']->set('STYLESHEETS', '__STYLESHEETS_PLACEHOLDER__');\n")
-			->write("\$context['definition']->set('SCRIPTS', '__SCRIPTS_PLACEHOLDER__');\n")
 			->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);")
 		;
 	}
-- 
cgit v1.2.1