From 6938fc41f22890bc70e7d7e29188a6da897dc6d1 Mon Sep 17 00:00:00 2001 From: lmsmartins Date: Mon, 27 Feb 2023 16:19:42 -0100 Subject: [PATCH 01/29] Fix #285: Fix CSS issues in login form, homepage and form-group class (#287) --- views/site/index.php | 6 ++--- views/site/login.php | 52 ++++++++++++++++++++++++-------------------- web/css/site.css | 4 ++++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/views/site/index.php b/views/site/index.php index a981f912c..dcb288fdc 100644 --- a/views/site/index.php +++ b/views/site/index.php @@ -6,7 +6,7 @@ ?>
-
+

Congratulations!

You have successfully created your Yii-powered application.

@@ -17,7 +17,7 @@
-
+

Heading

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et @@ -27,7 +27,7 @@

Yii Documentation »

-
+

Heading

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et diff --git a/views/site/login.php b/views/site/login.php index ebb07d9c3..db003c01c 100644 --- a/views/site/login.php +++ b/views/site/login.php @@ -2,6 +2,7 @@ /** @var yii\web\View $this */ /** @var yii\bootstrap5\ActiveForm $form */ + /** @var app\models\LoginForm $model */ use yii\bootstrap5\ActiveForm; @@ -15,35 +16,40 @@

Please fill out the following fields to login:

- 'login-form', - 'layout' => 'horizontal', - 'fieldConfig' => [ - 'template' => "{label}\n{input}\n{error}", - 'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'], - 'inputOptions' => ['class' => 'col-lg-3 form-control'], - 'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'], - ], - ]); ?> +
+
+ + 'login-form', + 'fieldConfig' => [ + 'template' => "{label}\n{input}\n{error}", + 'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'], + 'inputOptions' => ['class' => 'col-lg-3 form-control'], + 'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'], + ], + ]); ?> - field($model, 'username')->textInput(['autofocus' => true]) ?> + field($model, 'username')->textInput(['autofocus' => true]) ?> - field($model, 'password')->passwordInput() ?> + field($model, 'password')->passwordInput() ?> - field($model, 'rememberMe')->checkbox([ - 'template' => "
{input} {label}
\n
{error}
", - ]) ?> + field($model, 'rememberMe')->checkbox([ + 'template' => "
{input} {label}
\n
{error}
", + ]) ?> -
-
- 'btn btn-primary', 'name' => 'login-button']) ?> +
+
+ 'btn btn-primary', 'name' => 'login-button']) ?> +
-
- + -
- You may login with admin/admin or demo/demo.
- To modify the username/password, please check out the code app\models\User::$users. +
+ You may login with admin/admin or demo/demo.
+ To modify the username/password, please check out the code app\models\User::$users. +
+ +
diff --git a/web/css/site.css b/web/css/site.css index cd81ae1c9..fb300b39e 100644 --- a/web/css/site.css +++ b/web/css/site.css @@ -82,3 +82,7 @@ a.desc:after { .nav > li > form > button.logout:focus { outline: none; } + +.form-group { + margin-bottom: 1rem; +} \ No newline at end of file From 943608d179824f892429e69e48e7470dda953d90 Mon Sep 17 00:00:00 2001 From: Arhell Date: Sun, 30 Apr 2023 09:38:33 +0300 Subject: [PATCH 02/29] update irc link --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 48bbda8eb..251234a07 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "issues": "https://github.com/yiisoft/yii2/issues?state=open", "forum": "https://www.yiiframework.com/forum/", "wiki": "https://www.yiiframework.com/wiki/", - "irc": "irc://irc.freenode.net/yii", + "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, "minimum-stability": "dev", From 332f794a1b7e3e6d5acb9c06dd079376ee4ceb36 Mon Sep 17 00:00:00 2001 From: Ihor Sychevskyi Date: Tue, 2 May 2023 08:07:01 +0300 Subject: [PATCH 03/29] update github folder link (#291) --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3d8d32c25..ea75bda5f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -3,5 +3,5 @@ Contributing to Yii2 - [Report an issue](https://github.com/yiisoft/yii2/blob/master/docs/internals/report-an-issue.md) - [Translate documentation or messages](https://github.com/yiisoft/yii2/blob/master/docs/internals/translation-workflow.md) -- [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/) +- [Give us feedback or start a design discussion](https://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/) - [Contribute to the core code or fix bugs](https://github.com/yiisoft/yii2/blob/master/docs/internals/git-workflow.md) From 5772c69cb52a41ed05d444c6faab71fb26402170 Mon Sep 17 00:00:00 2001 From: Arhell Date: Thu, 4 May 2023 00:41:22 +0300 Subject: [PATCH 04/29] update assets folder links --- assets/AppAsset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/AppAsset.php b/assets/AppAsset.php index 732d48efc..3d40487ae 100644 --- a/assets/AppAsset.php +++ b/assets/AppAsset.php @@ -1,8 +1,8 @@ Date: Sun, 7 May 2023 12:08:51 +0300 Subject: [PATCH 05/29] update commands folder links (#295) --- commands/HelloController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/HelloController.php b/commands/HelloController.php index 20066c40c..9ec914d3c 100644 --- a/commands/HelloController.php +++ b/commands/HelloController.php @@ -1,8 +1,8 @@ Date: Wed, 10 May 2023 09:53:16 +0300 Subject: [PATCH 06/29] update tests folder links (#297) --- tests/bin/yii | 4 ++-- tests/bin/yii.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/bin/yii b/tests/bin/yii index 4923537fb..39df4013d 100755 --- a/tests/bin/yii +++ b/tests/bin/yii @@ -3,9 +3,9 @@ /** * Yii console bootstrap file. * - * @link http://www.yiiframework.com/ + * @link https://www.yiiframework.com/ * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ + * @license https://www.yiiframework.com/license/ */ defined('YII_DEBUG') or define('YII_DEBUG', true); diff --git a/tests/bin/yii.bat b/tests/bin/yii.bat index d516b3a19..ce14c92bc 100644 --- a/tests/bin/yii.bat +++ b/tests/bin/yii.bat @@ -4,9 +4,9 @@ rem ------------------------------------------------------------- rem Yii command line bootstrap script for Windows. rem rem @author Qiang Xue -rem @link http://www.yiiframework.com/ +rem @link https://www.yiiframework.com/ rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ +rem @license https://www.yiiframework.com/license/ rem ------------------------------------------------------------- @setlocal From 7c567643e327344a7049a2a9731cfe39bbc133c1 Mon Sep 17 00:00:00 2001 From: Ihor Sychevskyi Date: Sat, 13 May 2023 11:33:44 +0300 Subject: [PATCH 07/29] update views folder links (#299) --- views/site/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/site/index.php b/views/site/index.php index dcb288fdc..df5df7c3d 100644 --- a/views/site/index.php +++ b/views/site/index.php @@ -11,7 +11,7 @@

You have successfully created your Yii-powered application.

-

Get started with Yii

+

Get started with Yii

@@ -25,7 +25,7 @@ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

-

Yii Documentation »

+

Yii Documentation »

Heading

@@ -35,7 +35,7 @@ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

-

Yii Forum »

+

Yii Forum »

Heading

@@ -45,7 +45,7 @@ ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

-

Yii Extensions »

+

Yii Extensions »

From db7f9237660c9bec41f04f4fa34221bf7a5d778d Mon Sep 17 00:00:00 2001 From: Ihor Sychevskyi Date: Mon, 15 May 2023 09:48:51 +0300 Subject: [PATCH 08/29] update root folder links (#301) --- README.md | 12 ++++++------ requirements.php | 10 +++++----- yii | 4 ++-- yii.bat | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index b93a740e6..981a7f9d9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

-Yii 2 Basic Project Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for +Yii 2 Basic Project Template is a skeleton [Yii 2](https://www.yiiframework.com/) application best for rapidly creating small projects. The template contains the basic features including user login/logout and a contact page. @@ -45,8 +45,8 @@ INSTALLATION ### Install via Composer -If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions -at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix). +If you do not have [Composer](https://getcomposer.org/), you may install it by following the instructions +at [getcomposer.org](https://getcomposer.org/doc/00-intro.md#installation-nix). You can then install this project template using the following command: @@ -63,7 +63,7 @@ http://localhost/basic/web/ ### Install from an Archive File -Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to +Extract the archive file downloaded from [yiiframework.com](https://www.yiiframework.com/download/) to a directory named `basic` that is directly under the Web root. Set cookie validation key in `config/web.php` file to some random secret string: @@ -131,7 +131,7 @@ return [ TESTING ------- -Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](http://codeception.com/). +Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](https://codeception.com/). By default, there are 3 test suites: - `unit` @@ -164,7 +164,7 @@ To execute acceptance tests do the following: composer update ``` -4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it: +4. Download [Selenium Server](https://www.seleniumhq.org/download/) and launch it: ``` java -jar ~/selenium-server-standalone-x.xx.x.jar diff --git a/requirements.php b/requirements.php index 6cf322eb0..c1a6bf680 100644 --- a/requirements.php +++ b/requirements.php @@ -105,22 +105,22 @@ 'name' => 'Memcache extension', 'mandatory' => false, 'condition' => extension_loaded('memcache') || extension_loaded('memcached'), - 'by' => 'MemCache', - 'memo' => extension_loaded('memcached') ? 'To use memcached set MemCache::useMemcached to true.' : '' + 'by' => 'MemCache', + 'memo' => extension_loaded('memcached') ? 'To use memcached set MemCache::useMemcached to true.' : '' ), // CAPTCHA: array( 'name' => 'GD PHP extension with FreeType support', 'mandatory' => false, 'condition' => $gdOK, - 'by' => 'Captcha', + 'by' => 'Captcha', 'memo' => $gdMemo, ), array( 'name' => 'ImageMagick PHP extension with PNG support', 'mandatory' => false, 'condition' => $imagickOK, - 'by' => 'Captcha', + 'by' => 'Captcha', 'memo' => $imagickMemo, ), // PHP ini : @@ -153,7 +153,7 @@ 'name' => 'APC extension', 'mandatory' => false, 'condition' => extension_loaded('apc'), - 'by' => 'ApcCache', + 'by' => 'ApcCache', ); } diff --git a/yii b/yii index 2a2e8ede7..1d0008f5d 100755 --- a/yii +++ b/yii @@ -3,9 +3,9 @@ /** * Yii console bootstrap file. * - * @link http://www.yiiframework.com/ + * @link https://www.yiiframework.com/ * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ + * @license https://www.yiiframework.com/license/ */ defined('YII_DEBUG') or define('YII_DEBUG', true); diff --git a/yii.bat b/yii.bat index d516b3a19..ce14c92bc 100644 --- a/yii.bat +++ b/yii.bat @@ -4,9 +4,9 @@ rem ------------------------------------------------------------- rem Yii command line bootstrap script for Windows. rem rem @author Qiang Xue -rem @link http://www.yiiframework.com/ +rem @link https://www.yiiframework.com/ rem @copyright Copyright (c) 2008 Yii Software LLC -rem @license http://www.yiiframework.com/license/ +rem @license https://www.yiiframework.com/license/ rem ------------------------------------------------------------- @setlocal From eb38308780bfd358a50892cc3bc14bbce1de2c29 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Mon, 22 May 2023 21:24:55 +0400 Subject: [PATCH 09/29] Update dependencies so app is installable with PHP 8.2 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 251234a07..59b9380ee 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,10 @@ "issues": "https://github.com/yiisoft/yii2/issues?state=open", "forum": "https://www.yiiframework.com/forum/", "wiki": "https://www.yiiframework.com/wiki/", - "irc": "ircs://irc.libera.chat:6697/yii", + "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", @@ -25,11 +25,11 @@ "yiisoft/yii2-faker": "~2.0.0", "phpunit/phpunit": "~9.5.0", "codeception/codeception": "^5.0.0 || ^4.0", - "codeception/lib-innerbrowser": "^3.0 || ^1.1", + "codeception/lib-innerbrowser": "^4.0 || ^3.0 || ^1.1", "codeception/module-asserts": "^3.0 || ^1.1", "codeception/module-yii2": "^1.1", - "codeception/module-filesystem": "^3.0 || ^1.1", - "codeception/verify": "^2.2", + "codeception/module-filesystem": "^3.0 || ^2.0 || ^1.1", + "codeception/verify": "^3.0 || ^2.2", "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4" }, "config": { From d9b5bcc4009d46f6c6abf00d94484f9a90efc52e Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Mon, 22 May 2023 21:34:17 +0400 Subject: [PATCH 10/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59b9380ee..84d901d2e 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 6ee68d17d5f921f042a85b81278f078b42302e91 Mon Sep 17 00:00:00 2001 From: Arhell Date: Wed, 14 Jun 2023 03:23:18 +0300 Subject: [PATCH 11/29] update irc link --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 84d901d2e..722fcba65 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "issues": "https://github.com/yiisoft/yii2/issues?state=open", "forum": "https://www.yiiframework.com/forum/", "wiki": "https://www.yiiframework.com/wiki/", - "irc": "irc://irc.freenode.net/yii", + "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, "minimum-stability": "dev", From c083f404c25ee4113dbc8e5dba4b0c45c79375a5 Mon Sep 17 00:00:00 2001 From: Bizley Date: Tue, 29 Aug 2023 16:27:32 +0200 Subject: [PATCH 12/29] release version 2.0.49 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 722fcba65..f60a8f9e2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From cf0fbf086f902d13c27331686b8521548a3cb24e Mon Sep 17 00:00:00 2001 From: Bizley Date: Tue, 29 Aug 2023 16:27:51 +0200 Subject: [PATCH 13/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f60a8f9e2..722fcba65 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 645ec663377730395311c089115844f52444356a Mon Sep 17 00:00:00 2001 From: Stefan Linke Date: Fri, 13 Oct 2023 21:08:54 +0200 Subject: [PATCH 14/29] Remove explicit phpunit/phpunit requirement phpunit is not explicitly required, all the included tests run with codeception, not phpunit (not directly, at least). Fixes #308 --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 722fcba65..7819706f1 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ "yiisoft/yii2-debug": "~2.1.0", "yiisoft/yii2-gii": "~2.2.0", "yiisoft/yii2-faker": "~2.0.0", - "phpunit/phpunit": "~9.5.0", "codeception/codeception": "^5.0.0 || ^4.0", "codeception/lib-innerbrowser": "^4.0 || ^3.0 || ^1.1", "codeception/module-asserts": "^3.0 || ^1.1", From 8dd081c9973c1c1e3f7fa9e4f2a3114e952a0eb1 Mon Sep 17 00:00:00 2001 From: Stefan Linke Date: Thu, 19 Oct 2023 16:18:23 +0000 Subject: [PATCH 15/29] Fix #303: Remove composer.lock from .gitignore (#309) --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 28419e445..5bd9be80b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,6 @@ Thumbs.db # composer itself is not needed composer.phar -# composer lock -composer.lock - # Mac DS_Store Files .DS_Store From 530178da663f0f09ef36ae78e5519bcf37827536 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 30 May 2024 20:36:00 +0300 Subject: [PATCH 16/29] release version 2.0.50 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7819706f1..3b612fac2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From a5a02bb4b08a5c34065671e4300f922195c3a302 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 30 May 2024 20:36:12 +0300 Subject: [PATCH 17/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b612fac2..7819706f1 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 607351720de1ad8c4f12b89b69397941be61c045 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 18 Jul 2024 23:03:04 +0300 Subject: [PATCH 18/29] release version 2.0.51 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7819706f1..3b612fac2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 44e6fe42887df64f50be4e96ceacca8132b3c102 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 18 Jul 2024 23:03:18 +0300 Subject: [PATCH 19/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b612fac2..7819706f1 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 510f0e24ade3fbc0e926e1e86d8cb78adaa2a1b0 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 7 Sep 2024 18:24:39 +0300 Subject: [PATCH 20/29] Remove explicit version of symfony/browser-kit See https://github.com/Codeception/module-yii2/issues/105 --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7819706f1..4b6cab88c 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,7 @@ "codeception/module-asserts": "^3.0 || ^1.1", "codeception/module-yii2": "^1.1", "codeception/module-filesystem": "^3.0 || ^2.0 || ^1.1", - "codeception/verify": "^3.0 || ^2.2", - "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4" + "codeception/verify": "^3.0 || ^2.2" }, "config": { "allow-plugins": { From 8a980897015c85017260c2a66fb72e4be44b787a Mon Sep 17 00:00:00 2001 From: Matheus Evangelista Morais Date: Wed, 12 Feb 2025 22:25:20 -0300 Subject: [PATCH 21/29] Just adding space in comments for documentation --- views/site/error.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/site/error.php b/views/site/error.php index 4a37b2568..176874796 100644 --- a/views/site/error.php +++ b/views/site/error.php @@ -3,7 +3,7 @@ /** @var yii\web\View $this */ /** @var string $name */ /** @var string $message */ -/** @var Exception$exception */ +/** @var Exception $exception */ use yii\helpers\Html; From fa65fe091e50daadab408b8b72744ff3c9a0b3a2 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 13 Feb 2025 23:25:15 +0300 Subject: [PATCH 22/29] release version 2.0.52 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b6cab88c..0d05011ca 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 281a5dcec4e0856764c1a94594e3535a73678208 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 13 Feb 2025 23:25:29 +0300 Subject: [PATCH 23/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0d05011ca..4b6cab88c 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 2b430206f2ac40fb6d93b00462493cbc77b2036b Mon Sep 17 00:00:00 2001 From: Fejan <63099555+fejan-malek@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:40:44 +0530 Subject: [PATCH 24/29] Update cache version and PHP version in GH workflow action (#320) --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1065f909..564343a98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: env: extensions: dom, json, gd, imagick - key: cache-v1 + key: cache-v4 runs-on: ${{ matrix.os }} @@ -24,6 +24,9 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" + - "8.3" + - "8.4" steps: - name: Checkout @@ -38,7 +41,7 @@ jobs: key: ${{ env.key }} - name: Cache extensions - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.cache-env.outputs.dir }} key: ${{ steps.cache-env.outputs.key }} @@ -62,7 +65,7 @@ jobs: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" >> $GITHUB_ENV - name: Cache dependencies installed with composer - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.cache-env.outputs.dir }} key: php${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }} From 2fedf51a4f4c662a57133294ef1850c4d838f947 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 27 Jun 2025 11:01:57 +0300 Subject: [PATCH 25/29] release version 2.0.53 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b6cab88c..0d05011ca 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 9836ece64899d4faac10ad43aaed85a99ace9410 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 27 Jun 2025 11:02:11 +0300 Subject: [PATCH 26/29] prepare for next release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0d05011ca..4b6cab88c 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "irc": "ircs://irc.libera.chat:6697/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "require": { "php": ">=7.4.0", "yiisoft/yii2": "~2.0.45", From 3c14e8bade29455f6315d9e7216dacc9dacfc9f2 Mon Sep 17 00:00:00 2001 From: Fejan <63099555+fejan-malek@users.noreply.github.com> Date: Thu, 14 Aug 2025 21:50:58 +0530 Subject: [PATCH 27/29] Change: updated checkout version in GH from v2 to v5 (#321) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 564343a98..a5beac653 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v5 - name: Setup cache environment id: cache-env From 0f91f32ecff52ef479addb0a5013342d59fe0697 Mon Sep 17 00:00:00 2001 From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com> Date: Mon, 27 Oct 2025 10:51:14 +0300 Subject: [PATCH 28/29] Fix codestyle (#322) --- assets/AppAsset.php | 1 + commands/HelloController.php | 1 + config/__autocomplete.php | 12 +++++++----- config/test.php | 1 + config/test_db.php | 1 + mail/layouts/text.php | 2 +- models/LoginForm.php | 2 +- requirements.php | 1 + tests/_bootstrap.php | 3 ++- tests/_support/AcceptanceTester.php | 6 +++--- tests/_support/FunctionalTester.php | 1 - tests/_support/UnitTester.php | 6 +++--- tests/acceptance/ContactCest.php | 4 ++-- tests/acceptance/HomeCest.php | 6 +++--- tests/functional/ContactFormCest.php | 8 ++++---- tests/functional/LoginFormCest.php | 5 ++--- tests/unit/models/LoginFormTest.php | 1 - tests/unit/models/UserTest.php | 5 ++--- tests/unit/widgets/AlertTest.php | 6 ++++-- 19 files changed, 39 insertions(+), 33 deletions(-) diff --git a/assets/AppAsset.php b/assets/AppAsset.php index 3d40487ae..d9d4cc430 100644 --- a/assets/AppAsset.php +++ b/assets/AppAsset.php @@ -1,4 +1,5 @@ validate()) { - return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0); + return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0); } return false; } diff --git a/requirements.php b/requirements.php index c1a6bf680..db69a36ee 100644 --- a/requirements.php +++ b/requirements.php @@ -1,4 +1,5 @@ amOnPage(Url::toRoute('/site/contact')); } - + public function contactPageWorks(AcceptanceTester $I) { $I->wantTo('ensure that contact page works'); @@ -25,7 +25,7 @@ public function contactFormCanBeSubmitted(AcceptanceTester $I) $I->fillField('#contactform-verifycode', 'testme'); $I->click('contact-button'); - + $I->wait(2); // wait for button to be clicked $I->dontSeeElement('#contact-form'); diff --git a/tests/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php index e65df16ae..98fb6b9f7 100644 --- a/tests/acceptance/HomeCest.php +++ b/tests/acceptance/HomeCest.php @@ -6,13 +6,13 @@ class HomeCest { public function ensureThatHomePageWorks(AcceptanceTester $I) { - $I->amOnPage(Url::toRoute('/site/index')); + $I->amOnPage(Url::toRoute('/site/index')); $I->see('My Company'); - + $I->seeLink('About'); $I->click('About'); $I->wait(2); // wait for page to be opened - + $I->see('This is the About page.'); } } diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php index d17ef52fd..f1ccaf18f 100644 --- a/tests/functional/ContactFormCest.php +++ b/tests/functional/ContactFormCest.php @@ -1,6 +1,6 @@ see('Contact', 'h1'); + $I->see('Contact', 'h1'); } public function submitEmptyForm(\FunctionalTester $I) @@ -38,7 +38,7 @@ public function submitFormWithIncorrectEmail(\FunctionalTester $I) $I->see('Email is not a valid email address.'); $I->dontSee('Subject cannot be blank', '.help-inline'); $I->dontSee('Body cannot be blank', '.help-inline'); - $I->dontSee('The verification code is incorrect', '.help-inline'); + $I->dontSee('The verification code is incorrect', '.help-inline'); } public function submitFormSuccessfully(\FunctionalTester $I) @@ -52,6 +52,6 @@ public function submitFormSuccessfully(\FunctionalTester $I) ]); $I->seeEmailIsSent(); $I->dontSeeElement('#contact-form'); - $I->see('Thank you for contacting us. We will respond to you as soon as possible.'); + $I->see('Thank you for contacting us. We will respond to you as soon as possible.'); } } diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php index 7a83a27d6..a1545a706 100644 --- a/tests/functional/LoginFormCest.php +++ b/tests/functional/LoginFormCest.php @@ -10,7 +10,6 @@ public function _before(\FunctionalTester $I) public function openLoginPage(\FunctionalTester $I) { $I->see('Login', 'h1'); - } // demonstrates `amLoggedInAs` method @@ -54,6 +53,6 @@ public function loginSuccessfully(\FunctionalTester $I) 'LoginForm[password]' => 'admin', ]); $I->see('Logout (admin)'); - $I->dontSeeElement('form#login-form'); + $I->dontSeeElement('form#login-form'); } -} \ No newline at end of file +} diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php index 3c1dcddaa..6f96c2377 100644 --- a/tests/unit/models/LoginFormTest.php +++ b/tests/unit/models/LoginFormTest.php @@ -47,5 +47,4 @@ public function testLoginCorrect() verify(\Yii::$app->user->isGuest)->false(); verify($this->model->errors)->arrayHasNotKey('password'); } - } diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php index 28986cbbd..3db9772a3 100644 --- a/tests/unit/models/UserTest.php +++ b/tests/unit/models/UserTest.php @@ -19,7 +19,7 @@ public function testFindUserByAccessToken() verify($user = User::findIdentityByAccessToken('100-token'))->notEmpty(); verify($user->username)->equals('admin'); - verify(User::findIdentityByAccessToken('non-existing'))->empty(); + verify(User::findIdentityByAccessToken('non-existing'))->empty(); } public function testFindUserByUsername() @@ -38,7 +38,6 @@ public function testValidateUser() verify($user->validateAuthKey('test102key'))->empty(); verify($user->validatePassword('admin'))->notEmpty(); - verify($user->validatePassword('123456'))->empty(); + verify($user->validatePassword('123456'))->empty(); } - } diff --git a/tests/unit/widgets/AlertTest.php b/tests/unit/widgets/AlertTest.php index e9857a161..af2db5d21 100644 --- a/tests/unit/widgets/AlertTest.php +++ b/tests/unit/widgets/AlertTest.php @@ -177,7 +177,8 @@ public function testMultipleWarningMessages() verify($renderingResult)->stringNotContainsString('alert-info'); } - public function testSingleMixedMessages() { + public function testSingleMixedMessages() + { $errorMessage = 'This is an error message'; $dangerMessage = 'This is a danger message'; $successMessage = 'This is a success message'; @@ -204,7 +205,8 @@ public function testSingleMixedMessages() { verify($renderingResult)->stringContainsString('alert-warning'); } - public function testMultipleMixedMessages() { + public function testMultipleMixedMessages() + { $firstErrorMessage = 'This is the first error message'; $secondErrorMessage = 'This is the second error message'; $firstDangerMessage = 'This is the first danger message'; From db54e5150dcdcebe1ca3ee2edab1f7e2a84f72f3 Mon Sep 17 00:00:00 2001 From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com> Date: Mon, 27 Oct 2025 21:41:22 +0300 Subject: [PATCH 29/29] Exclude commits with CS changes from Git Blame (#323) --- .git-blame-ignore-revs | 8 ++++++++ .gitattributes | 11 ++++++----- .gitignore | 3 +++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..011c056bb --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,8 @@ +# Reformat code te be PSR-2 compatible +93cc82c4bf42cea403e1acaab201338bea304b6e +# Convert to short syntax (array) +332030325fbad38a64c5e60980d3b14b6434d6dd +# Convert to short syntax +b0fcdfab1aecaeb620f75a83f15aa02bc25765a0 +# Fix codestyle +0f91f32ecff52ef479addb0a5013342d59fe0697 diff --git a/.gitattributes b/.gitattributes index 3e9092c68..705fb391d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ # Ignore all test and documentation for archive -/.github export-ignore -/.gitattributes export-ignore -/.scrutinizer.yml export-ignore -/.travis.yml export-ignore -/docs export-ignore +/.github export-ignore +/.git-blame-ignore-revs export-ignore +/.gitattributes export-ignore +/.scrutinizer.yml export-ignore +/.travis.yml export-ignore +/docs export-ignore diff --git a/.gitignore b/.gitignore index 5bd9be80b..05fb29d1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # phpstorm project files .idea +# visual studio code project files +.vscode + # netbeans project files nbproject