Skip to content

Commit cc0a2e0

Browse files
samdarksamdark
authored
Merge pull request #20499 from terabytesoftw/sync-to-master8
2 parents ec66ea3 + 50bcc3f commit cc0a2e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+537
-178
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
php: [8.1, 8.2, 8.3, 8.4]
23+
php: [8.1, 8.2, 8.3, 8.4, 8.5]
2424

2525
steps:
2626
- name: Generate french locale.
@@ -45,7 +45,7 @@ jobs:
4545
run: composer self-update
4646

4747
- name: Install dependencies with composer.
48-
run: composer update $DEFAULT_COMPOSER_FLAGS
48+
run: composer update $DEFAULT_COMPOSER_FLAGS ${{ matrix.php == 8.5 && '--ignore-platform-reqs' || '' }}
4949

5050
- name: Run tests with PHPUnit.
5151
run: vendor/bin/phpunit ${{ env.PHPUNIT_COMMAND }}

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ phpunit.phar
4848
/node_modules
4949
.env
5050
package-lock.json
51+
52+
# local phpstan config
53+
phpstan.neon

‎build/controllers/views/translation/report_html.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
use yii\helpers\Html;
44

5+
/**
6+
* @var \yii\web\View $this
7+
* @var string $title
8+
* @var string $sourcePath
9+
* @var string $translationPath
10+
* @var array $results
11+
*/
12+
513
?><!doctype html>
614
<html>
715
<head>
@@ -46,4 +54,4 @@
4654
<?php endif ?>
4755
<?php endforeach ?>
4856
</body>
49-
</html>
57+
</html>

‎composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@
8080
"cebe/indent": "~1.0.2",
8181
"dealerdirect/phpcodesniffer-composer-installer": "*",
8282
"dms/phpunit-arraysubset-asserts": "^0.5",
83-
"phpunit/phpunit": "9.6",
84-
"yiisoft/yii2-coding-standards": "^3.0"
83+
"phpunit/phpunit": "^9.6",
84+
"yiisoft/yii2-coding-standards": "^3.0",
85+
"phpstan/phpstan": "^1.12"
8586
},
8687
"suggest": {
8788
"yiisoft/yii2-coding-standards": "you can use this package to check for code style issues when contributing to yii"

0 commit comments

Comments
 (0)