mirror of
				https://github.com/yiisoft/yii2.git
				synced 2025-10-31 02:28:35 +08:00 
			
		
		
		
	Add compatibility with PHP 8.3 (#20074)
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @ -65,6 +65,10 @@ jobs: | ||||
|             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached | ||||
|             coverage: none | ||||
|             os: ubuntu-latest | ||||
|           - php: 8.3 | ||||
|             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached | ||||
|             coverage: none | ||||
|             os: ubuntu-latest | ||||
|  | ||||
|     steps: | ||||
|       - name: Generate french locale. | ||||
|  | ||||
							
								
								
									
										2
									
								
								.github/workflows/ci-mssql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci-mssql.yml
									
									
									
									
										vendored
									
									
								
							| @ -29,6 +29,8 @@ jobs: | ||||
|             mssql: server:2019-latest | ||||
|           - php: 8.2 | ||||
|             mssql: server:2022-latest | ||||
|           - php: 8.3 | ||||
|             mssql: server:2022-latest | ||||
|  | ||||
|     services: | ||||
|       mssql: | ||||
|  | ||||
							
								
								
									
										1
									
								
								.github/workflows/ci-mysql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/ci-mysql.yml
									
									
									
									
										vendored
									
									
								
							| @ -27,6 +27,7 @@ jobs: | ||||
|           - 8.0 | ||||
|           - 8.1 | ||||
|           - 8.2 | ||||
|           - 8.3 | ||||
|  | ||||
|         mysql: | ||||
|           - 5.7 | ||||
|  | ||||
							
								
								
									
										2
									
								
								.github/workflows/ci-pgsql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci-pgsql.yml
									
									
									
									
										vendored
									
									
								
							| @ -26,6 +26,8 @@ jobs: | ||||
|           - 7.4 | ||||
|           - 8.0 | ||||
|           - 8.1 | ||||
|           - 8.2 | ||||
|           - 8.3 | ||||
|  | ||||
|         pgsql: | ||||
|           - 10 | ||||
|  | ||||
							
								
								
									
										1
									
								
								.github/workflows/ci-sqlite.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/ci-sqlite.yml
									
									
									
									
										vendored
									
									
								
							| @ -28,6 +28,7 @@ jobs: | ||||
|               - 8.0 | ||||
|               - 8.1 | ||||
|               - 8.2 | ||||
|               - 8.3 | ||||
|  | ||||
|     steps: | ||||
|       - name: Checkout. | ||||
|  | ||||
							
								
								
									
										108
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										108
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							| @ -4,14 +4,14 @@ | ||||
|         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", | ||||
|         "This file is @generated automatically" | ||||
|     ], | ||||
|     "content-hash": "80e3f228bae519816def145a5a1d47ae", | ||||
|     "content-hash": "9ee35a67e578251573a9017059b62b76", | ||||
|     "packages": [ | ||||
|         { | ||||
|             "name": "bower-asset/inputmask", | ||||
|             "version": "5.0.8", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/RobinHerbots/Inputmask.git", | ||||
|                 "url": "git@github.com:RobinHerbots/Inputmask.git", | ||||
|                 "reference": "e0f39e0c93569c6b494c3a57edef2c59313a6b64" | ||||
|             }, | ||||
|             "dist": { | ||||
| @ -29,16 +29,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "bower-asset/jquery", | ||||
|             "version": "3.7.1", | ||||
|             "version": "3.6.4", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/jquery/jquery-dist.git", | ||||
|                 "reference": "fde1f76e2799dd877c176abde0ec836553246991" | ||||
|                 "url": "git@github.com:jquery/jquery-dist.git", | ||||
|                 "reference": "91ef2d8836342875f2519b5815197ea0f23613cf" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/fde1f76e2799dd877c176abde0ec836553246991", | ||||
|                 "reference": "fde1f76e2799dd877c176abde0ec836553246991" | ||||
|                 "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/91ef2d8836342875f2519b5815197ea0f23613cf", | ||||
|                 "reference": "91ef2d8836342875f2519b5815197ea0f23613cf" | ||||
|             }, | ||||
|             "type": "bower-asset", | ||||
|             "license": [ | ||||
| @ -147,20 +147,20 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "ezyang/htmlpurifier", | ||||
|             "version": "v4.16.0", | ||||
|             "version": "v4.17.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/ezyang/htmlpurifier.git", | ||||
|                 "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" | ||||
|                 "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", | ||||
|                 "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", | ||||
|                 "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", | ||||
|                 "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" | ||||
|                 "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" | ||||
|             }, | ||||
|             "require-dev": { | ||||
|                 "cerdic/css-tidy": "^1.7 || ^2.0", | ||||
| @ -202,9 +202,9 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/ezyang/htmlpurifier/issues", | ||||
|                 "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" | ||||
|                 "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" | ||||
|             }, | ||||
|             "time": "2022-09-18T07:06:19+00:00" | ||||
|             "time": "2023-11-17T15:01:25+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "paragonie/random_compat", | ||||
| @ -373,16 +373,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "composer/pcre", | ||||
|             "version": "3.1.0", | ||||
|             "version": "3.1.1", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/composer/pcre.git", | ||||
|                 "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" | ||||
|                 "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", | ||||
|                 "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", | ||||
|                 "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", | ||||
|                 "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -424,7 +424,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/composer/pcre/issues", | ||||
|                 "source": "https://github.com/composer/pcre/tree/3.1.0" | ||||
|                 "source": "https://github.com/composer/pcre/tree/3.1.1" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -440,7 +440,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2022-11-17T09:50:14+00:00" | ||||
|             "time": "2023-10-11T07:11:09+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "composer/semver", | ||||
| @ -715,16 +715,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "doctrine/deprecations", | ||||
|             "version": "v1.1.1", | ||||
|             "version": "1.1.2", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/doctrine/deprecations.git", | ||||
|                 "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" | ||||
|                 "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", | ||||
|                 "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", | ||||
|                 "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", | ||||
|                 "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -756,9 +756,9 @@ | ||||
|             "homepage": "https://www.doctrine-project.org/", | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/doctrine/deprecations/issues", | ||||
|                 "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" | ||||
|                 "source": "https://github.com/doctrine/deprecations/tree/1.1.2" | ||||
|             }, | ||||
|             "time": "2023-06-03T09:27:29+00:00" | ||||
|             "time": "2023-09-27T20:04:15+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "doctrine/instantiator", | ||||
| @ -2228,16 +2228,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/console", | ||||
|             "version": "v6.3.4", | ||||
|             "version": "v6.3.8", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/console.git", | ||||
|                 "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" | ||||
|                 "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", | ||||
|                 "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", | ||||
|                 "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", | ||||
|                 "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -2298,7 +2298,7 @@ | ||||
|                 "terminal" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/console/tree/v6.3.4" | ||||
|                 "source": "https://github.com/symfony/console/tree/v6.3.8" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -2314,11 +2314,11 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-08-16T10:10:12+00:00" | ||||
|             "time": "2023-10-31T08:09:35+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/deprecation-contracts", | ||||
|             "version": "v3.3.0", | ||||
|             "version": "v3.4.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/deprecation-contracts.git", | ||||
| @ -2365,7 +2365,7 @@ | ||||
|             "description": "A generic function and convention to trigger deprecation notices", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" | ||||
|                 "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -2465,7 +2465,7 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/event-dispatcher-contracts", | ||||
|             "version": "v3.3.0", | ||||
|             "version": "v3.4.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/event-dispatcher-contracts.git", | ||||
| @ -2521,7 +2521,7 @@ | ||||
|                 "standards" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" | ||||
|                 "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -2604,16 +2604,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/finder", | ||||
|             "version": "v6.3.3", | ||||
|             "version": "v6.3.5", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/finder.git", | ||||
|                 "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e" | ||||
|                 "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e", | ||||
|                 "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e", | ||||
|                 "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", | ||||
|                 "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -2648,7 +2648,7 @@ | ||||
|             "description": "Finds files and directories via an intuitive fluent interface", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/finder/tree/v6.3.3" | ||||
|                 "source": "https://github.com/symfony/finder/tree/v6.3.5" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -2664,7 +2664,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-07-31T08:31:44+00:00" | ||||
|             "time": "2023-09-26T12:56:25+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/options-resolver", | ||||
| @ -3288,16 +3288,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/service-contracts", | ||||
|             "version": "v3.3.0", | ||||
|             "version": "v3.4.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/service-contracts.git", | ||||
|                 "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" | ||||
|                 "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", | ||||
|                 "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", | ||||
|                 "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", | ||||
|                 "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -3350,7 +3350,7 @@ | ||||
|                 "standards" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" | ||||
|                 "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -3366,7 +3366,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-05-23T14:45:45+00:00" | ||||
|             "time": "2023-07-30T20:28:31+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/stopwatch", | ||||
| @ -3432,16 +3432,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/string", | ||||
|             "version": "v6.3.2", | ||||
|             "version": "v6.3.8", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/string.git", | ||||
|                 "reference": "53d1a83225002635bca3482fcbf963001313fb68" | ||||
|                 "reference": "13880a87790c76ef994c91e87efb96134522577a" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", | ||||
|                 "reference": "53d1a83225002635bca3482fcbf963001313fb68", | ||||
|                 "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", | ||||
|                 "reference": "13880a87790c76ef994c91e87efb96134522577a", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @ -3498,7 +3498,7 @@ | ||||
|                 "utf8" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/string/tree/v6.3.2" | ||||
|                 "source": "https://github.com/symfony/string/tree/v6.3.8" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @ -3514,7 +3514,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-07-05T08:41:27+00:00" | ||||
|             "time": "2023-11-09T08:28:21+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/yaml", | ||||
|  | ||||
| @ -20,7 +20,7 @@ class BaseDataProviderTest extends TestCase | ||||
|         $rc = new \ReflectionClass(BaseDataProvider::className()); | ||||
|         $rp = $rc->getProperty('counter'); | ||||
|         $rp->setAccessible(true); | ||||
|         $rp->setValue(null); | ||||
|         $rp->setValue(new ConcreteDataProvider(), null); | ||||
|  | ||||
|         $this->assertNull((new ConcreteDataProvider())->id); | ||||
|         $this->assertNotNull((new ConcreteDataProvider())->id); | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Wilmer Arambula
					Wilmer Arambula