Skip to content

Commit 9d3b845

Browse files
developedsoftwareLuke English
andauthored
Update composer depedencies to be the same as the advanced application (yiisoft#262)
* Compatible with PHP 8.1 and Codeception 5 * Add PHP 8.1 to workflow * PHP 7.4 as a minimum * Updated dependencies Co-authored-by: Luke English <luke.english@ec2i.biz>
1 parent 24d97b9 commit 9d3b845

File tree

14 files changed

+36
-29
lines changed

14 files changed

+36
-29
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Thumbs.db
1818
# composer itself is not needed
1919
composer.phar
2020

21+
# composer lock
22+
composer.lock
23+
2124
# Mac DS_Store Files
2225
.DS_Store
2326

assets/AppAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ class AppAsset extends AssetBundle
2626
];
2727
public $depends = [
2828
'yii\web\YiiAsset',
29-
'yii\bootstrap4\BootstrapAsset',
29+
'yii\bootstrap5\BootstrapAsset'
3030
];
3131
}

codeception.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ actor: Tester
22
bootstrap: _bootstrap.php
33
paths:
44
tests: tests
5-
log: tests/_output
5+
output: tests/_output
66
data: tests/_data
77
helpers: tests/_support
88
settings:

composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@
1515
"minimum-stability": "dev",
1616
"require": {
1717
"php": ">=7.4.0",
18-
"yiisoft/yii2": "~2.0.14",
19-
"yiisoft/yii2-bootstrap4": "~2.0.0",
18+
"yiisoft/yii2": "~2.0.45",
19+
"yiisoft/yii2-bootstrap5": "~2.0.2",
2020
"yiisoft/yii2-symfonymailer": "~2.0.3"
2121
},
2222
"require-dev": {
2323
"yiisoft/yii2-debug": "~2.1.0",
2424
"yiisoft/yii2-gii": "~2.2.0",
2525
"yiisoft/yii2-faker": "~2.0.0",
26-
"codeception/codeception": "^4.0",
27-
"codeception/module-asserts": "^1.0",
28-
"codeception/module-yii2": "^1.0",
29-
"codeception/module-filesystem": "^1.0",
26+
"phpunit/phpunit": "~9.5.0",
27+
"codeception/codeception": "^5.0.0-alpha2 || ^4.0",
28+
"codeception/lib-innerbrowser": "^3.0 || ^1.1",
29+
"codeception/module-asserts": "^3.0 || ^1.1",
30+
"codeception/module-yii2": "dev-codecept5 || ^1.1",
31+
"codeception/module-filesystem": "^3.0 || ^1.1",
3032
"codeception/verify": "^2.2",
31-
"symfony/browser-kit": ">=2.7 <=4.2.4"
33+
"symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
3234
},
3335
"config": {
3436
"allow-plugins": {

config/test.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
'components' => [
1717
'db' => $db,
1818
'mailer' => [
19+
'class' => \yii\symfonymailer\Mailer::class,
20+
'viewPath' => '@app/mail',
21+
// send all mails to a file by default.
1922
'useFileTransport' => true,
2023
'messageClass' => 'yii\symfonymailer\Message'
2124
],

config/web.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
'errorAction' => 'site/error',
2828
],
2929
'mailer' => [
30-
'class' => 'yii\swiftmailer\Mailer',
31-
// send all mails to a file by default. You have to set
32-
// 'useFileTransport' to false and configure transport
33-
// for the mailer to send real emails.
30+
'class' => \yii\symfonymailer\Mailer::class,
31+
'viewPath' => '@app/mail',
32+
// send all mails to a file by default.
3433
'useFileTransport' => true,
3534
],
3635
'log' => [

tests/acceptance.suite.yml.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class_name: AcceptanceTester
1+
actor: AcceptanceTester
22
modules:
33
enabled:
44
- WebDriver:

tests/functional.suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
88
#basic/web/index.php
9-
class_name: FunctionalTester
9+
actor: FunctionalTester
1010
modules:
1111
enabled:
1212
- Filesystem

tests/unit.suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# suite for unit (internal) tests.
44
# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
55

6-
class_name: UnitTester
6+
actor: UnitTester
77
modules:
88
enabled:
99
- Asserts

tests/unit/models/UserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testFindUserByUsername()
3131
/**
3232
* @depends testFindUserByUsername
3333
*/
34-
public function testValidateUser($user)
34+
public function testValidateUser()
3535
{
3636
$user = User::findByUsername('admin');
3737
verify($user->validateAuthKey('test100key'))->notEmpty();

0 commit comments

Comments
 (0)