Merge pull request #43 from VSEphpbb/update

Some fixes and updates for phpBB 3.2.x

Author: michaelcullum

ext.php

@@ -28,7 +28,31 @@ class ext extends \phpbb\extension\base
 	 */
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '3.1.4', '>=') && class_exists('ZipArchive');
+		return class_exists('ZipArchive') && ($this->phpbb_legacy_compatibility() || $this->phpbb_current_compatibility());
+	}
+
+	/**
+	 * Check phpBB 3.1 compatibility
+	 *
+	 * Requires phpBB 3.1.4 or greater
+	 *
+	 * @return bool
+	 */
+	protected function phpbb_legacy_compatibility()
+	{
+		return phpbb_version_compare(PHPBB_VERSION, '3.1.4', '>=') && phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<');
+	}
+
+	/**
+	 * Check phpBB 3.2 (and later) compatibility
+	 *
+	 * Requires phpBB 3.2.0-b3 or greater
+	 *
+	 * @return bool
+	 */
+	protected function phpbb_current_compatibility()
+	{
+		return phpbb_version_compare(PHPBB_VERSION, '3.2.0-b3', '>=');
 	}
 }
 

helper/packager.php

@@ -246,45 +246,21 @@ protected function get_template_engine()
 		}
 		else
 		{
-			// TODO: Remove these hacks once 3.2.x is stable
-			if ($this->phpbb_container->hasParameter('core.cache_dir'))
-			{
-				// Set up for phpBB > 3.2.0-b3
-				$cache_dir = $this->phpbb_container->getParameter('core.cache_dir');
-				$environment = new environment(
-					$config,
-					$this->phpbb_container->get('filesystem'),
-					$this->phpbb_container->get('path_helper'),
-					$cache_dir,
-					$this->phpbb_container->get('ext.manager'),
-					new loader(
-						new \phpbb\filesystem\filesystem()
-					)
-				);
-			}
-			else
-			{
-				// Set up for phpBB 3.2.0-dev to 3.2.0-b2
-				$cache_dir = $this->phpbb_container->getParameter('core.root_path') . 'cache/';
-				$environment = new environment(
+			$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,
-					$cache_dir,
+					$this->phpbb_container->getParameter('core.cache_dir'),
 					$this->phpbb_container->get('ext.manager'),
 					new loader(
 						new \phpbb\filesystem\filesystem()
 					)
-				);
-			}
-
-			$template_engine = new twig(
-				$this->phpbb_container->get('path_helper'),
-				$config,
-				new context(),
-				$environment,
-				$cache_dir,
+				),
+				$this->phpbb_container->getParameter('core.cache_dir'),
 				$this->phpbb_container->get('user')
 			);
 		}

skeleton/tests/dbal/simple_test.php.twig

@@ -14,7 +14,7 @@
 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';
+require_once __DIR__ . '/../../../../../includes/functions.php';
 
 class simple_test extends \phpbb_database_test_case
 {
@@ -28,14 +28,25 @@ class simple_test extends \phpbb_database_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
 	}
 
 	public function test_column()
 	{
 		$this->db = $this->new_dbal();
-		$tools = (phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<') ? '\phpbb\db\tools' : '\phpbb\db\tools\tools');
-		$db_tools = new $tools($this->db);
+
+		if (phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<'))
+		{
+			// This is how to instantiate db_tools in phpBB 3.1
+			$db_tools = new \phpbb\db\tools($this->db);
+		}
+		else
+		{
+			// This is how to instantiate db_tools in phpBB 3.2
+			$factory = new \phpbb\db\tools\factory();
+			$db_tools = $factory->get($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');
 	}