diff --git a/phpBB/adm/style/acp_ext_catalog.html b/phpBB/adm/style/acp_ext_catalog.html
index fff5c551a6..b47a241c55 100644
--- a/phpBB/adm/style/acp_ext_catalog.html
+++ b/phpBB/adm/style/acp_ext_catalog.html
@@ -2,15 +2,15 @@
 
 <a id="maincontent"></a>
 
-<h1>{{lang( 'EXTENSIONS_CATALOG') }}</h1>
+<h1>{{ lang( 'EXTENSIONS_CATALOG') }}</h1>
 
-<p>{{lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
+<p>{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
 
 {% if not enabled %}
 <div class="errorbox">
 	{{ lang('EXTENSIONS_COMPOSER_NOT_WRITABLE') }}
 </div>
-{% endif %}
+{% endif %}I
 
 <fieldset class="quick quick-left">
 	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 15a9d74623..d9fe8df039 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -658,19 +658,21 @@ class acp_extensions
 				$this->page_title = 'ACP_EXTENSIONS_CATALOG';
 				$this->tpl_name = 'acp_ext_catalog';
 
-				$this->template->assign_var('extensions', $extensions);
-				$this->template->assign_var('managed_extensions', array_keys($managed_packages));
-				$this->template->assign_var('installed_extensions', array_keys($extensions_manager->all_available()));
-				$this->template->assign_var('U_ACTION', $this->u_action);
-				$this->template->assign_var('settings', [
-					'enable_packagist' => $this->config['exts_composer_packagist'],
-					'enable_on_install' => $this->config['exts_composer_enable_on_install'],
-					'purge_on_remove' => $this->config['exts_composer_purge_on_remove'],
-					'minimum_stability' => $this->config['exts_composer_minimum_stability'],
-					'stabilities' => array_keys(\Composer\Package\BasePackage::$stabilities),
-					'repositories' => json_decode($this->config['exts_composer_repositories'], true),
+				$this->template->assign_vars([
+					'enabled'				=> $manager->check_requirements(),
+					'extensions'			=> $extensions,
+					'managed_extensions'	=> array_keys($managed_packages),
+					'installed_extensions'	=> array_keys($extensions_manager->all_available()),
+					'U_ACTION'				=> $this->u_action,
+					'settings' => [
+						'enable_packagist'	=> $this->config['exts_composer_packagist'],
+						'enable_on_install'	=> $this->config['exts_composer_enable_on_install'],
+						'purge_on_remove'	=> $this->config['exts_composer_purge_on_remove'],
+						'minimum_stability'	=> $this->config['exts_composer_minimum_stability'],
+						'stabilities'		=> array_keys(\Composer\Package\BasePackage::$stabilities),
+						'repositories'		=> json_decode($this->config['exts_composer_repositories'], true),
+					],
 				]);
-				$this->template->assign_var('enabled', $manager->check_requirements());
 
 				add_form_key('catalog_settings');
 
diff --git a/phpBB/phpbb/composer/manager_interface.php b/phpBB/phpbb/composer/manager_interface.php
index 9fae7a0e9c..3cb401f2b6 100644
--- a/phpBB/phpbb/composer/manager_interface.php
+++ b/phpBB/phpbb/composer/manager_interface.php
@@ -1,15 +1,21 @@
 <?php
 /**
- * Created by IntelliJ IDEA.
- * User: tristan.darricau
- * Date: 09/09/15
- * Time: 23:12
+ *
+ * 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.
+ *
  */
+
 namespace phpbb\composer;
+
 use Composer\IO\IOInterface;
 use phpbb\composer\exception\runtime_exception;
 
-
 /**
  * Class to manage packages through composer.
  */