Skip to content

Commit 1318ae9

Browse files
fullpipefullpipe
authored
Merge pull request #1 from akuzia/1.22
1.22
2 parents bde8137 + 3104909 commit 1318ae9

Some content is hidden

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

42 files changed

+643
-329
lines changed

‎.github/FUNDING.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# These are supported funding model platforms
2+
3+
open_collective: yiisoft
4+
github: [yiisoft]
5+
tidelift: "packagist/yiisoft/yii"
6+

‎.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
<!--
12
Note that only PHP 7 compatibility issues are accepted. For security issues contact maintainers privately.
3+
-->
24

35
### What steps will reproduce the problem?
46

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
<!--
12
Note that only PHP 7 compatibility fixes are accepted. Please report security issues to maintainers privately.
3+
-->
24

35
| Q | A
46
| ------------- | ---
5-
| Is bugfix? | yes
6-
| New feature? | no
7-
| Breaks BC? | no
8-
| Tests pass? | yes/no
7+
| Is bugfix? | ✔️/❌
8+
| New feature? | ✔️/❌
9+
| Breaks BC? | ✔️/❌
10+
| Tests pass? | ✔️/❌
911
| Fixed issues | comma-separated list of tickets # fixed by the PR, if any

‎.github/SECURITY.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Security Policy
2+
3+
Please use the [security issue form](https://www.yiiframework.com/security) to report to us any security issue you find in Yii.
4+
DO NOT use the issue tracker or discuss it in the public forum as it will cause more damage than help.
5+
6+
Please note that as a non-commerial OpenSource project we are not able to pay bounties at the moment.

‎.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: php
2+
dist: trusty
23

34
php:
5+
- 7.4
6+
- 7.3
47
- 7.2
58
- 7.1
69
- 7.0
@@ -48,16 +51,16 @@ cache:
4851
install:
4952
- travis_retry composer self-update && composer --version
5053
- travis_retry composer update --prefer-dist --no-interaction
51-
- if [[ $TRAVIS_PHP_VERSION == 7.2 ]] || [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
54+
- if [[ $TRAVIS_PHP_VERSION == 7.2 ]] || [[ $TRAVIS_PHP_VERSION == "7.4" ]] || [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
5255
printf "autodetect\n" | pecl install mcrypt-snapshot;
5356
fi
5457

5558
before_script:
5659
# Disable the HHVM JIT for faster Unit Testing
5760
- if [[ $TRAVIS_PHP_VERSION = hhv* ]]; then echo 'hhvm.jit = 0' >> /etc/hhvm/php.ini; fi
58-
# Disable DEPRECATE messages during PHPUnit initialization on PHP 7.2. To fix them, PHPUnit should be updated to 6.*
59-
- if [[ $TRAVIS_PHP_VERSION == 7.2 ]] || [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
60-
echo 'Disabled DEPRECATED notifications for PHP 7.2';
61+
# Disable DEPRECATE messages during PHPUnit initialization on PHP>=7.2. To fix them, PHPUnit should be updated to 6.*
62+
- if [[ $TRAVIS_PHP_VERSION == 7.2 ]] || [[ $TRAVIS_PHP_VERSION == 7.3 ]] || [[ $TRAVIS_PHP_VERSION == "7.4" ]] || [[ $TRAVIS_PHP_VERSION == "nightly" ]]; then
63+
echo 'Disabled DEPRECATED notifications for PHP>=7.2';
6164
echo 'error_reporting = E_ALL & ~E_DEPRECATED' >> /tmp/php-config.ini;
6265
phpenv config-add /tmp/php-config.ini;
6366
fi

‎CHANGELOG

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
 Yii Framework Change Log
22
========================
33

4-
Version 1.1.21 under development
4+
Version 1.1.23 under development
55
--------------------------------
66

7-
- Bug #4220: Fixed PHP 7.2 incompatibility caused by the use of `create_function` in CHttpRequest (martinpetrasch)
7+
- Bug #4291: The scheme (protocol) is deleted when validateIDN is enabled after validation (Argevollen)
8+
9+
Version 1.1.22 January 16, 2020
10+
-------------------------------
11+
12+
- Bug #4256: PHP 7 compatibility: PHP4 style constructor in Pear/Text/Diff3.php (kenguest)
13+
- Bug #4256: PHP 7 compatibility: Fixed deprecated usage of create_function() in markdown.php (samdark)
14+
- Bug #4261: PHP 7.2 compatibility: INTL_IDNA_VARIANT_2003 has been depreacated (machour)
15+
- Enh #4273: PHP 7.3 compatibility: Add "sameSite" support for cookies (thekonz)
16+
- Bug #4279: PHP 7.4 compatibility: Drop use of accessing string offsets using curly braces (kenguest)
17+
18+
Version 1.1.21 April 2, 2019
19+
----------------------------
20+
21+
- Bug #4220: Fixed PHP 7.2 incompatibility caused by the use of `create_function` in CHttpRequest and CProfileLogRoute (martinpetrasch, freezy-sk)
822
- Bug #4229: Remove deprecation errors from framework/web/js/source/jquery.yiiactiveform.js when using jQuery 3.1.1 (kenguest)
23+
- Bug #4234: CVE-2018-14773. Drop support for HTTP_X_REWRITE_URL (kenguest)
24+
- Chg #4236: Freeze session before changing ini settings to be compatible with PHP 7.2 (vxk7m)
25+
- Bug #4238: Fixed intolerance to nulls in `CJavaScript::quote()` (stevoh6, ddziaduch)
26+
- Bug #4227: Fixed PHPUnit 6 compatibility (gianniszach)
927

1028
Version 1.1.20 July 6, 2018
1129
---------------------------

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Yii Web Programming Framework
33

44
Thank you for choosing Yii - a high-performance component-based PHP framework.
55

6-
[![Build Status](https://secure.travis-ci.org/yiisoft/yii.png)](http://travis-ci.org/yiisoft/yii)
6+
[![Build Status](https://api.travis-ci.com/yiisoft/yii.png)](http://travis-ci.com/yiisoft/yii)
77

88
> Note that Yii 1.1 [has reached end of life](http://www.yiiframework.com/news/90/update-on-yii-1-1-support-and-end-of-life/)
99
and won't receive updates except security fixes. Please start new projects using [Yii 2](https://github.com/yiisoft/yii2).

‎UPGRADE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ General upgrade instructions
1818
issues to Yii issue tracker.
1919

2020

21+
Upgrading from v1.1.22
22+
----------------------
23+
24+
No significant changes were made.
25+
26+
Upgrading from v1.1.21
27+
----------------------
28+
29+
No significant changes were made.
30+
2131
Upgrading from v1.1.20
2232
----------------------
2333

‎composer.json

Lines changed: 92 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,87 @@
11
{
2-
"name": "wikium/yii",
3-
"description": "Yii Web Programming Framework",
4-
"keywords": ["yii", "framework"],
5-
"homepage": "http://www.yiiframework.com/",
6-
"type": "library",
7-
"license": "BSD-3-Clause",
8-
"authors": [
9-
{
10-
"name": "Qiang Xue",
11-
"email": "[email protected]",
12-
"homepage": "http://www.yiiframework.com/",
13-
"role": "Founder and project lead"
14-
},
15-
{
16-
"name": "Alexander Makarov",
17-
"email": "[email protected]",
18-
"homepage": "http://rmcreative.ru/",
19-
"role": "Core framework development"
20-
},
21-
{
22-
"name": "Maurizio Domba",
23-
"homepage": "http://mdomba.info/",
24-
"role": "Core framework development"
25-
},
26-
{
27-
"name": "Carsten Brandt",
28-
"email": "[email protected]",
29-
"homepage": "http://cebe.cc/",
30-
"role": "Core framework development"
31-
},
32-
{
33-
"name": "Timur Ruziev",
34-
"email": "[email protected]",
35-
"homepage": "http://resurtm.com/",
36-
"role": "Core framework development"
37-
},
38-
{
39-
"name": "Paul Klimov",
40-
"email": "[email protected]",
41-
"role": "Core framework development"
42-
},
43-
{
44-
"name": "Wei Zhuo",
45-
"email": "[email protected]",
46-
"role": "Project site maintenance and development"
47-
},
48-
{
49-
"name": "Sebastián Thierer",
50-
"email": "[email protected]",
51-
"role": "Component development"
52-
},
53-
{
54-
"name": "Jeffrey Winesett",
55-
"email": "[email protected]",
56-
"role": "Documentation and marketing"
57-
}
58-
59-
],
60-
"support": {
61-
"issues": "https://github.com/yiisoft/yii/issues?state=open",
62-
"forum": "http://www.yiiframework.com/forum/",
63-
"wiki": "http://www.yiiframework.com/wiki/",
64-
"irc": "irc://irc.freenode.net/yii",
65-
"source": "https://github.com/yiisoft/yii"
66-
},
67-
"bin": [
68-
"framework/yiic"
69-
],
70-
"archive": {
71-
"exclude": [
72-
"demos"
73-
]
74-
},
75-
"require": {
76-
"php": ">=5.1.0"
77-
},
78-
"suggest": {
79-
"ext-mcrypt": "Required by encrypt and decrypt methods of CSecurityManager"
80-
},
81-
"autoload": {
82-
"classmap" : [
83-
"framework/YiiBase.php",
2+
"name": "wikium/yii",
3+
"description": "Yii Web Programming Framework",
4+
"keywords": ["yii", "framework"],
5+
"homepage": "http://www.yiiframework.com/",
6+
"type": "library",
7+
"license": "BSD-3-Clause",
8+
"authors": [
9+
{
10+
"name": "Qiang Xue",
11+
"email": "[email protected]",
12+
"homepage": "http://www.yiiframework.com/",
13+
"role": "Founder and project lead"
14+
},
15+
{
16+
"name": "Alexander Makarov",
17+
"email": "[email protected]",
18+
"homepage": "http://rmcreative.ru/",
19+
"role": "Core framework development"
20+
},
21+
{
22+
"name": "Maurizio Domba",
23+
"homepage": "http://mdomba.info/",
24+
"role": "Core framework development"
25+
},
26+
{
27+
"name": "Carsten Brandt",
28+
"email": "[email protected]",
29+
"homepage": "http://cebe.cc/",
30+
"role": "Core framework development"
31+
},
32+
{
33+
"name": "Timur Ruziev",
34+
"email": "[email protected]",
35+
"homepage": "http://resurtm.com/",
36+
"role": "Core framework development"
37+
},
38+
{
39+
"name": "Paul Klimov",
40+
"email": "[email protected]",
41+
"role": "Core framework development"
42+
},
43+
{
44+
"name": "Wei Zhuo",
45+
"email": "[email protected]",
46+
"role": "Project site maintenance and development"
47+
},
48+
{
49+
"name": "Sebastián Thierer",
50+
"email": "[email protected]",
51+
"role": "Component development"
52+
},
53+
{
54+
"name": "Jeffrey Winesett",
55+
"email": "[email protected]",
56+
"role": "Documentation and marketing"
57+
}
58+
59+
],
60+
"support": {
61+
"issues": "https://github.com/yiisoft/yii/issues?state=open",
62+
"forum": "http://www.yiiframework.com/forum/",
63+
"wiki": "http://www.yiiframework.com/wiki/",
64+
"irc": "irc://irc.freenode.net/yii",
65+
"source": "https://github.com/yiisoft/yii"
66+
},
67+
"bin": [
68+
"framework/yiic"
69+
],
70+
"archive": {
71+
"exclude": [
72+
"demos"
73+
]
74+
},
75+
"require": {
76+
"php": ">=5.1.0"
77+
},
78+
"suggest": {
79+
"ext-mcrypt": "Required by encrypt and decrypt methods of CSecurityManager",
80+
"phpseclib/mcrypt_compat": "To provide mcrypt polyfill when extension is unavailable"
81+
},
82+
"autoload": {
83+
"classmap" : [
84+
"framework/YiiBase.php",
8485
"framework/yii.php",
8586
"framework/base",
8687
"framework/caching",
@@ -91,11 +92,13 @@
9192
"framework/logging",
9293
"framework/web",
9394
"framework/validators"
94-
]
95-
},
96-
"require-dev": {
97-
"phpunit/phpunit": "~4.8.34",
98-
"phpunit/phpunit-selenium": "~1.4.0",
99-
"phing/phing": "2.*"
100-
}
95+
]
96+
},
97+
"require-dev": {
98+
"phpunit/phpunit": "~4.8.34",
99+
"phpunit/phpunit-selenium": "~1.4.0",
100+
"phing/phing": "2.*",
101+
"phpseclib/mcrypt_compat": "^1.0",
102+
"pear/archive_tar": "~1.4.6"
103+
}
101104
}

‎framework/YiiBase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class YiiBase
8787
*/
8888
public static function getVersion()
8989
{
90-
return '1.1.21-dev';
90+
return '1.1.23-dev';
9191
}
9292

9393
/**

0 commit comments

Comments
 (0)