Skip to content

Commit 49077e1

Browse files
authored
Merge branch 'master' into replace-strftime-with-date
2 parents b4c5e33 + 731aae2 commit 49077e1

24 files changed

+330
-117
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ phpunit.phar
4949
/node_modules
5050
.env
5151
package-lock.json
52+
53+
# local phpstan config
54+
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
"dealerdirect/phpcodesniffer-composer-installer": "*",
8686
"dms/phpunit-arraysubset-asserts": "^0.5",
8787
"phpunit/phpunit": "^9.6",
88-
"yiisoft/yii2-coding-standards": "^3.0"
88+
"yiisoft/yii2-coding-standards": "^3.0",
89+
"phpstan/phpstan": "^1.12"
8990
},
9091
"repositories": [
9192
{

0 commit comments

Comments
 (0)