From 7030578bbe9e11c18b5becaf8b06e670e3c2e3cd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 01:32:34 -0400
Subject: [ticket/11698] Moving all autoloadable files to phpbb/

PHPBB3-11698
---
 phpBB/phpbb/template/twig/node/includejs.php | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 phpBB/phpbb/template/twig/node/includejs.php

(limited to 'phpBB/phpbb/template/twig/node/includejs.php')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
new file mode 100644
index 0000000000..fdf2bea3ed
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'SCRIPTS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	protected function append_asset(Twig_Compiler $compiler)
+	{
+		$config = $this->environment->get_phpbb_config();
+
+		$compiler
+			->raw("<script type=\"text/javascript\" src=\"' . ")
+			->raw("\$asset_file")
+			->raw(". '\"></script>\n")
+		;
+	}
+}
-- 
cgit v1.2.1


From bf04bfcced7934704e7f2682ee608f490cb3fc76 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 23 Jul 2013 11:16:23 -0500
Subject: [ticket/11667] Use @inheritdoc

PHPBB3-11667
---
 phpBB/phpbb/template/twig/node/includejs.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node/includejs.php')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 50ab448e0f..2b4b55fb0a 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -10,9 +10,7 @@
 class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
 {
 	/**
-	* Get the definition name
-	*
-	* @return string (e.g. 'SCRIPTS')
+	* {@inheritdoc}
 	*/
 	public function get_definition_name()
 	{
@@ -20,10 +18,7 @@ class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includ
 	}
 
 	/**
-	* Append the output code for the asset
-	*
-	* @param Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* {@inheritdoc}
 	*/
 	protected function append_asset(Twig_Compiler $compiler)
 	{
-- 
cgit v1.2.1


From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/includejs.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node/includejs.php')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index fdf2bea3ed..7b400d9154 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
+namespace phpbb\template\twig\node;
+
+class includejs extends \phpbb\template\twig\node\includeasset
 {
 	public function get_definition_name()
 	{
@@ -19,7 +21,7 @@ class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includ
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	protected function append_asset(Twig_Compiler $compiler)
+	protected function append_asset(\Twig_Compiler $compiler)
 	{
 		$config = $this->environment->get_phpbb_config();
 
-- 
cgit v1.2.1


From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 02:41:03 +0200
Subject: [ticket/11700] Fix tests after merging new develop code

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

(limited to 'phpBB/phpbb/template/twig/node/includejs.php')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 510e221e07..696b640eac 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -22,7 +22,7 @@ class includejs extends \phpbb\template\twig\node\includeasset
 	/**
 	* {@inheritdoc}
 	*/
-	protected function append_asset(Twig_Compiler $compiler)
+	protected function append_asset(\Twig_Compiler $compiler)
 	{
 		$config = $this->environment->get_phpbb_config();
 
-- 
cgit v1.2.1


From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 20:18:06 +0200
Subject: [ticket/12594] Remove @package tags and update file headers

PHPBB3-12594
---
 phpBB/phpbb/template/twig/node/includejs.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node/includejs.php')

diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 696b640eac..0f67f9ff60 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
-- 
cgit v1.2.1