Allow functionality within phpBB 3.2

* Allow functionality within phpBB 3.2

# Conflicts:
#	composer.json
#	config/services.yml

* Reduce some duplication

Author: iMattPro

composer.json

@@ -23,7 +23,7 @@
 	"extra": {
 		"display-name": "phpBB Skeleton Extension",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.4,<3.2.0@dev"
+			"phpbb/phpbb": ">=3.1.4,<3.3.0@dev"
 		}
 	}
 }

config/services.yml

@@ -18,7 +18,7 @@ services:
         class: phpbb\skeleton\helper\packager
         arguments:
             - '@user'
-            - '@path_helper'
+            - '@service_container'
             - '@phpbb.skeleton.collection'
             - '%core.root_path%'
 

helper/packager.php

@@ -15,10 +15,12 @@
 
 use phpbb\config\config;
 use phpbb\di\service_collection;
-use phpbb\path_helper;
 use phpbb\template\context;
+use phpbb\template\twig\environment;
+use phpbb\template\twig\loader;
 use phpbb\template\twig\twig;
 use phpbb\user;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
@@ -29,8 +31,8 @@ class packager
 	/** @var user */
 	protected $user;
 
-	/** @var path_helper */
-	protected $path_helper;
+	/** @var ContainerInterface */
+	protected $phpbb_container;
 
 	/** @var service_collection */
 	protected $collection;
@@ -39,14 +41,14 @@ class packager
 	 * Constructor
 	 *
 	 * @param user $user User instance (mostly for translation)
-	 * @param path_helper $path_helper The filesystem object
+	 * @param ContainerInterface $phpbb_container
 	 * @param service_collection $collection
 	 * @param string $root_path
 	 */
-	public function __construct(user $user, path_helper $path_helper, service_collection $collection, $root_path)
+	public function __construct(user $user, ContainerInterface $phpbb_container, service_collection $collection, $root_path)
 	{
 		$this->user = $user;
-		$this->path_helper = $path_helper;
+		$this->phpbb_container = $phpbb_container;
 		$this->collection = $collection;
 		$this->root_path = $root_path;
 	}
@@ -109,11 +111,43 @@ public function create_extension($data)
 		$filesystem->remove($this->root_path . 'store/tmp-ext');
 		$filesystem->mkdir($ext_path);
 
-		$template_engine = new twig($this->path_helper, new config(array(
+		$config = new config(array(
 			'load_tplcompile' => true,
 			'tpl_allow_php' => false,
 			'assets_version' => null,
-		)), $this->user, new context());
+		));
+
+		if (phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<'))
+		{
+			$template_engine = new twig(
+				$this->phpbb_container->get('path_helper'),
+				$config,
+				$this->user,
+				new context()
+			);
+		}
+		else
+		{
+			$template_engine = new twig(
+				$this->phpbb_container->get('path_helper'),
+				$config,
+				new context(),
+				new environment(
+					$config,
+					$this->phpbb_container->get('filesystem'),
+					$this->phpbb_container->get('path_helper'),
+					$this->phpbb_container,
+					$this->phpbb_container->getParameter('core.cache_dir'),
+					$this->phpbb_container->get('ext.manager'),
+					new loader(
+						new \phpbb\filesystem\filesystem()
+					)
+				),
+				$this->phpbb_container->getParameter('core.cache_dir'),
+				$this->phpbb_container->get('user')
+			);
+		}
+
 		$template_engine->set_custom_style('skeletonextension', $this->root_path . 'ext/phpbb/skeleton/skeleton');
 
 		$template_engine->assign_vars(array(

skeleton/tests/dbal/simple_test.php.tpl

@@ -13,6 +13,9 @@
 
 namespace {EXTENSION.vendor_name}\{EXTENSION.extension_name}\tests\dbal;
 
+// Need to include functions.php to use phpbb_version_compare in this test
+require_once dirname(__FILE__) . '/../../../../../includes/functions.php';
+
 class simple_test extends \phpbb_database_test_case
 {
 	static protected function setup_extensions()
@@ -31,7 +34,8 @@ class simple_test extends \phpbb_database_test_case
 	public function test_column()
 	{
 		$this->db = $this->new_dbal();
-		$db_tools = new \phpbb\db\tools($this->db);
+		$tools = (phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<') ? '\phpbb\db\tools' : '\phpbb\db\tools\tools');
+		$db_tools = new $tools($this->db);
 		$this->assertTrue($db_tools->sql_column_exists(USERS_TABLE, 'user_acme'), 'Asserting that column "user_acme" exists');
 		$this->assertFalse($db_tools->sql_column_exists(USERS_TABLE, 'user_acme_demo'), 'Asserting that column "user_acme_demo" does not exist');
 	}