makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] PHP 5.4 compatibility

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-13 18:51:33 +02:00 • committed by Tristan Darricau
parent d5672303a3
commit 50b2989cf0
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/composer/installer.php
View file

@ -33,7 +33,7 @@ use phpbb\exception\runtime_exception;
*/ */
class installer class installer
{ {
const PHPBB_TYPES = ['phpbb-extension', 'phpbb-style', 'phpbb-language']; const PHPBB_TYPES = 'phpbb-extension,phpbb-style,phpbb-language';
/** /**
* @var array Repositories to look packages from * @var array Repositories to look packages from
@ -268,7 +268,7 @@ class installer
{ {
try try
{ {
$this->generate_ext_json_file($this->do_get_installed_packages(self::PHPBB_TYPES)); $this->generate_ext_json_file($this->do_get_installed_packages(explode(',', self::PHPBB_TYPES)));
$io = new NullIO(); $io = new NullIO();
$composer = Factory::create($io, $this->get_composer_ext_json_filename(), false); $composer = Factory::create($io, $this->get_composer_ext_json_filename(), false);

2
phpBB/phpbb/composer/manager.php
View file

@ -173,7 +173,7 @@ class manager implements manager_interface
{ {
if ($this->all_managed_packages === null) if ($this->all_managed_packages === null)
{ {
$this->all_managed_packages = $this->installer->get_installed_packages(installer::PHPBB_TYPES); $this->all_managed_packages = $this->installer->get_installed_packages(explode(',', installer::PHPBB_TYPES));
} }
return $this->all_managed_packages; return $this->all_managed_packages;