1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2016-08-13 23:14:11 +02:00
11 changed files with 276 additions and 38 deletions

View File

@@ -36,13 +36,13 @@ class phpbb_dbal_migration_if extends \phpbb\db\migration\migration
{
global $migrator_test_if_true_failed;
$migrator_test_if_true_failed = false;
$migrator_test_if_true_failed = !$migrator_test_if_true_failed;
}
function test_false()
{
global $migrator_test_if_false_failed;
$migrator_test_if_false_failed = true;
$migrator_test_if_false_failed = !$migrator_test_if_false_failed;
}
}

View File

@@ -154,6 +154,14 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->assertFalse($migrator_test_if_true_failed, 'True test failed');
$this->assertFalse($migrator_test_if_false_failed, 'False test failed');
while ($this->migrator->migration_state('phpbb_dbal_migration_if') !== false)
{
$this->migrator->revert('phpbb_dbal_migration_if');
}
$this->assertFalse($migrator_test_if_true_failed, 'True test after revert failed');
$this->assertFalse($migrator_test_if_false_failed, 'False test after revert failed');
}
public function test_recall()

View File

@@ -0,0 +1,56 @@
<?php
/**
*
* 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.
*
*/
class reverse_update_data_test extends phpbb_test_case
{
/** @var \phpbb\db\migration\helper */
protected $helper;
public function setUp()
{
parent::setUp();
$this->helper = new \phpbb\db\migration\helper();
}
public function update_data_provider()
{
return array(
array(
array(
array('config.add', array('foobar', 1)),
array('if', array(
(false === true),
array('permission.add', array('some_data')),
)),
array('config.remove', array('foobar')),
array('custom', array(array($this, 'foo_bar'))),
array('tool.method', array('test_data')),
),
array(
array('tool.reverse', array('method', 'test_data')),
array('config.reverse', array('remove', 'foobar')),
array('config.reverse', array('add', 'foobar', 1)),
),
),
);
}
/**
* @dataProvider update_data_provider
*/
public function test_get_schema_steps($data_changes, $expected)
{
$this->assertEquals($expected, $this->helper->reverse_update_data($data_changes));
}
}