Merge reverts and fixes

Author: iMattPro

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "The official phpBB skeleton extension generator.",
 	"homepage": "https://www.phpbb.com/customise/db/official_tool/ext_skeleton/",
-	"version": "1.2.0-dev",
+	"version": "1.3.0-dev",
 	"license": "GPL-2.0-only",
 	"authors": [
 		{

helper/packager.php

@@ -16,6 +16,7 @@
 use phpbb\config\config;
 use phpbb\di\service_collection;
 use phpbb\filesystem\filesystem;
+use phpbb\path_helper;
 use phpbb\skeleton\ext;
 use phpbb\skeleton\template\twig\extension\skeleton_version_compare;
 use phpbb\template\context;
@@ -198,17 +199,19 @@ protected function get_template_engine()
 			'assets_version'  => null,
 		]);
 
-		/** @var path_helper $path_helper */
-		$path_helper = $this->phpbb_container->get('path_helper');
-		/** @var filesystem $filesystem */
-		$filesystem = $this->phpbb_container->get('filesystem');
+		$container = $this->phpbb_container;
+		$path_helper = $container->get('path_helper');
+		$filesystem = $container->get('filesystem');
+		$cache_dir = $container->getParameter('core.cache_dir');
+		$ext_manager = $container->get('ext.manager');
+
 		$environment = new environment(
 			$this->phpbb_container->get('assets.bag'),
 			$config,
 			$filesystem,
 			$path_helper,
-			$this->phpbb_container->getParameter('core.cache_dir'),
-			$this->phpbb_container->get('ext.manager'),
+			$cache_dir,
+			$ext_manager,
 			new loader()
 		);
 
@@ -224,7 +227,7 @@ protected function get_template_engine()
 			new context(),
 			$environment,
 			$cache_dir,
-			$container->get('user'),
+			$this->phpbb_container->get('user'),
 			[
 				new skeleton_version_compare()
 			]