mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

[ticket/11150] Use json instead of serialize

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2015-09-16 11:46:03 +02:00
committed by Tristan Darricau
parent f1e80830b7
commit c88c692ad6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ class installer
{
if ($config)
{
$repositories = unserialize($config['exts_composer_repositories']);
$repositories = json_decode($config['exts_composer_repositories'], true);
if (!is_array($repositories) && !empty($repositories))
{
@@ -606,7 +606,7 @@ class installer
*
* @param array $repositories An array of composer repositories to use
*/
public function set_repositories($repositories)
public function set_repositories(array $repositories)
{
$this->repositories = $repositories;
}

2
phpBB/phpbb/db/migration/data/v320/extensions_composer.php
View File

@@ -18,7 +18,7 @@ class extensions_composer extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.add', array('exts_composer_repositories', serialize([]))),
array('config.add', array('exts_composer_repositories', json_encode([], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))),
array('config.add', array('exts_composer_packagist', true)),
array('config.add', array('exts_composer_json_file', 'composer-ext.json')),
array('config.add', array('exts_composer_vendor_dir', 'vendor-ext/')),