Merge branch 'develop-ascraeus' into develop

phpBB/phpbb/template/twig/twig.php

@@ -158,6 +158,10 @@ class twig extends \phpbb\template\base
 		}
 
 		$names = $this->get_user_style();
+		// Add 'all' folder to $names array
+		//	It allows extensions to load a template file from 'all' folder,
+		//	if a style doesn't include it.
+		$names[] = 'all';
 
 		$paths = array();
 		foreach ($style_directories as $directory)

tests/extension/ext/vendor4/bar/composer.json

@@ -0,0 +1,23 @@
+{
+	"name": "vendor4/bar",
+	"type": "phpbb-extension",
+	"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
+	"version": "1.0.0",
+	"time": "2012-02-15 01:01:01",
+	"license": "GPL-2.0",
+	"authors": [{
+			"name": "John Smith",
+			"email": "email@phpbb.com",
+			"homepage": "http://phpbb.com",
+			"role": "N/A"
+		}],
+	"require": {
+		"php": ">=5.3"
+	},
+	"extra": {
+		"display-name": "phpBB Bar Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
+	}
+}

tests/extension/ext/vendor4/bar/styles/all/template/foobar_body.html

@@ -0,0 +1 @@
+All folder

tests/extension/manager_test.php

@@ -36,7 +36,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 	public function test_all_available()
 	{
 		// barfoo and vendor3/bar should not listed due to missing composer.json. barfoo also has incorrect dir structure.
-		$this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo'), array_keys($this->extension_manager->all_available()));
+		$this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo', 'vendor4/bar'), array_keys($this->extension_manager->all_available()));
 	}
 
 	public function test_all_enabled()

tests/functional/extension_acp_test.php

@@ -84,7 +84,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
 		$this->assertCount(1, $crawler->filter('.ext_enabled'));
-		$this->assertCount(5, $crawler->filter('.ext_disabled'));
+		$this->assertCount(6, $crawler->filter('.ext_disabled'));
 
 		$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());

tests/template/template_allfolder_test.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*
+* 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.
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_allfolder_test extends phpbb_template_template_test_case
+{
+	public function test_allfolder()
+	{
+		$this->setup_engine_for_allfolder();
+
+		$this->run_template('foobar_body.html', array(), array(), array(), "All folder");
+	}
+
+	protected function setup_engine_for_allfolder(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$defaults = $this->config_defaults();
+		$config = new \phpbb\config\config(array_merge($defaults, $new_config));
+		$this->user = new \phpbb\user('\phpbb\datetime');
+
+		$path_helper = new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
+			),
+			new \phpbb\filesystem(),
+			$this->getMock('\phpbb\request\request'),
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			dirname(__FILE__) . '/',
+			array(
+				'vendor4/bar' => array(
+					'ext_name' => 'vendor4/bar',
+					'ext_active' => '1',
+					'ext_path' => 'ext/vendor4/bar/',
+				),
+			)
+		);
+
+		$this->template_path = $this->test_path . '/templates';
+		$this->ext_template_path = 'tests/extension/ext/vendor4/bar/styles/all/template';
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $this->user, new \phpbb\template\context(), $this->extension_manager);
+		$this->template->set_custom_style('all', array($this->template_path, $this->ext_template_path));
+	}
+}