Remove some deprecated code

This commit is contained in:
Samuel Georges 2015-10-03 07:31:01 +10:00
parent 91d3d4dbde
commit 8e986c42b1
2 changed files with 1 additions and 18 deletions

View File

@ -1,10 +1,4 @@
<?php
$systemItems = System\Classes\SettingsManager::instance()->listItems('system');
// @todo Trialing the removal of this due to the new account menu
// @deprecated Remove if year >= 2016
$mySettingItems = []; //System\Classes\SettingsManager::instance()->listItems('mysettings');
?>
<?php /* @deprecated Remove if year >= 2016 */ ?>
<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $mySettingItems]); ?>
<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>
<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>

View File

@ -189,17 +189,6 @@ class ControllerTest extends TestCase
$theme = Theme::load('test');
$controller = new Controller($theme);
$controller->run('/ajax-test');
//
// This was the old approach, can remove this comment block if year >= 2017
//
// $response = $controller->run('/ajax-test');
// $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
// $this->assertInternalType('string', $response->getOriginalContent());
// $this->assertEquals(500, $response->getStatusCode());
// $this->assertEquals("AJAX handler 'onNoHandler' was not found.", $response->getOriginalContent());
}
/**