mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-03 05:48:11 +08:00
Upgrade tests for PHP 7.4. (#20545)
This commit is contained in:
@ -1,10 +1,13 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @link https://www.yiiframework.com/
|
||||
* @copyright Copyright (c) 2008 Yii Software LLC
|
||||
* @license https://www.yiiframework.com/license/
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace yiiunit\framework\base;
|
||||
|
||||
use Yii;
|
||||
@ -24,7 +27,7 @@ class ModuleTest extends TestCase
|
||||
$this->mockApplication();
|
||||
}
|
||||
|
||||
public function testTrueParentModule()
|
||||
public function testTrueParentModule(): void
|
||||
{
|
||||
$parent = new Module('parent');
|
||||
$child = new Module('child');
|
||||
@ -37,7 +40,7 @@ class ModuleTest extends TestCase
|
||||
$this->assertEquals('parent', $child2->module->id);
|
||||
}
|
||||
|
||||
public function testGetControllerPath()
|
||||
public function testGetControllerPath(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
$controllerPath = __DIR__ . DIRECTORY_SEPARATOR . 'controllers';
|
||||
@ -46,7 +49,7 @@ class ModuleTest extends TestCase
|
||||
$this->assertEquals($controllerPath, str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $module->getControllerPath()));
|
||||
}
|
||||
|
||||
public function testSetControllerPath()
|
||||
public function testSetControllerPath(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
$controllerPath = __DIR__ . DIRECTORY_SEPARATOR . 'controllers';
|
||||
@ -55,7 +58,7 @@ class ModuleTest extends TestCase
|
||||
$this->assertEquals($controllerPath, $module->getControllerPath());
|
||||
}
|
||||
|
||||
public function testSetupVersion()
|
||||
public function testSetupVersion(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
|
||||
@ -72,7 +75,7 @@ class ModuleTest extends TestCase
|
||||
/**
|
||||
* @depends testSetupVersion
|
||||
*/
|
||||
public function testDefaultVersion()
|
||||
public function testDefaultVersion(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
|
||||
@ -82,7 +85,7 @@ class ModuleTest extends TestCase
|
||||
|
||||
public static $actionRuns = [];
|
||||
|
||||
public function testRunControllerAction()
|
||||
public function testRunControllerAction(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
$this->assertNull(Yii::$app->controller);
|
||||
@ -111,7 +114,7 @@ class ModuleTest extends TestCase
|
||||
}
|
||||
|
||||
|
||||
public function testServiceLocatorTraversal()
|
||||
public function testServiceLocatorTraversal(): void
|
||||
{
|
||||
$parent = new Module('parent');
|
||||
$child = new Module('child', $parent);
|
||||
@ -144,34 +147,34 @@ class ModuleTest extends TestCase
|
||||
$this->assertFalse($parent->has('test'));
|
||||
}
|
||||
|
||||
public function testCreateControllerByID()
|
||||
public function testCreateControllerByID(): void
|
||||
{
|
||||
$module = new TestModule('test');
|
||||
$module->controllerNamespace = 'yiiunit\framework\base';
|
||||
|
||||
$route = 'module-test';
|
||||
$this->assertInstanceOf(ModuleTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertInstanceOf(ModuleTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = 'module-test-';
|
||||
$this->assertNotInstanceOf(ModuleTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertNotInstanceOf(ModuleTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = '-module-test';
|
||||
$this->assertNotInstanceOf(ModuleTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertNotInstanceOf(ModuleTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = 'very-complex-name-test';
|
||||
$this->assertInstanceOf(VeryComplexNameTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertInstanceOf(VeryComplexNameTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = 'very-complex-name-test--';
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = '--very-complex-name-test';
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::class, $module->createControllerByID($route));
|
||||
|
||||
$route = 'very---complex---name---test';
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::className(), $module->createControllerByID($route));
|
||||
$this->assertNotInstanceOf(VeryComplexNameTestController::class, $module->createControllerByID($route));
|
||||
}
|
||||
|
||||
public function testCreateController()
|
||||
public function testCreateController(): void
|
||||
{
|
||||
// app module has a submodule "base" which has two controllers: "default" and "other"
|
||||
$module = new Module('app');
|
||||
@ -215,7 +218,7 @@ class ModuleTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
class TestModule extends \yii\base\Module
|
||||
class TestModule extends Module
|
||||
{
|
||||
public $controllerMap = [
|
||||
'test-controller1' => 'yiiunit\framework\base\ModuleTestController',
|
||||
@ -225,11 +228,11 @@ class TestModule extends \yii\base\Module
|
||||
|
||||
class ModuleTestController extends Controller
|
||||
{
|
||||
public function actionTest1()
|
||||
public function actionTest1(): void
|
||||
{
|
||||
ModuleTest::$actionRuns[] = $this->action->uniqueId;
|
||||
}
|
||||
public function actionTest2()
|
||||
public function actionTest2(): void
|
||||
{
|
||||
ModuleTest::$actionRuns[] = $this->action->uniqueId;
|
||||
}
|
||||
@ -237,7 +240,7 @@ class ModuleTestController extends Controller
|
||||
|
||||
class VeryComplexNameTestController extends Controller
|
||||
{
|
||||
public function actionIndex()
|
||||
public function actionIndex(): void
|
||||
{
|
||||
ModuleTest::$actionRuns[] = $this->action->uniqueId;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user